diff --git a/caotek_mesavoirs/templates/contents/doc_view.pt b/caotek_mesavoirs/templates/contents/doc_view.pt
index 5241455..3ea3b7a 100644
--- a/caotek_mesavoirs/templates/contents/doc_view.pt
+++ b/caotek_mesavoirs/templates/contents/doc_view.pt
@@ -10,12 +10,14 @@
 		Page text goes here.
 	</div>
 	<hr>
-	<p>
-		Dernière modification le ${doc.modif_le.strftime('%d/%m/%Y')}<br />
-		Tags : ${tags}
+	<p>Tags : 
+		<span tal:repeat="tag tags">
+			[ <a href="/tags#${tag.tag}">${tag.tag}</a> ]
+		</span>
 	</p>
 	<p tal:condition="not layout.isAnonymous">
-		Status : ${doc.statut}
+		Status : ${doc.statut}<br />
+		Dernière modification le ${doc.modif_le.strftime('%d/%m/%Y')}
 	</p>
 	
 	<br />
diff --git a/caotek_mesavoirs/views/contents.py b/caotek_mesavoirs/views/contents.py
index 69057ec..f1f15dd 100644
--- a/caotek_mesavoirs/views/contents.py
+++ b/caotek_mesavoirs/views/contents.py
@@ -53,8 +53,6 @@ def doc_edit(request):
         doc['intitule'] = ''
         doc['texte'] = ''
         doc['topic'] = topic
-        doc['tag1'] = ''
-        doc['tag2'] = ''
         doc['statut'] = 'private'
         tags = {}
     else:
@@ -131,9 +129,8 @@ def doc_view(request):
         url_retour = request.route_url('portfolio')
     else:
         url_retour = request.route_url('folder',topic=doc.topic)
-    tags = doc.tag1
-    if doc.tag2:
-        tags += ', ' + doc.tag2
+
+    tags = get_docs_tags(request, doc.doc_id)
     
     # insèrer le path de static/img
     texte = doc.texte.replace('static/img/', "%s/static/img/" % request.application_url)