diff -r 821253d361d1 -r c06d08c8a1b8 server/bo_client/app/templates/doc.hbs
--- a/server/bo_client/app/templates/doc.hbs	Thu Feb 25 21:26:15 2016 +0100
+++ b/server/bo_client/app/templates/doc.hbs	Sun Feb 28 09:30:23 2016 +0100
@@ -22,7 +22,7 @@
                 </div>
                 <div class="col-md-11">
                   <div class="content-title">{{t 'bo.document_language'}}</div>
-                  <div class="content-value">{{doc-language language=model.language}}</div>
+                  <div class="content-value">{{doc-language url=model.language}}</div>
                 </div>
               </div>
               <div class="row">
@@ -43,7 +43,7 @@
                 </div>
                 <div class="col-md-11">
                   <div class="content-title">{{t 'bo.document_subjects'}}</div>
-                  <div class="content-value">{{#each model.subjects as |subject index|}}{{if index ", "}}{{subject}}{{/each}}</div>
+                  <div class="content-value">{{#each model.subjects as |subject index|}}{{if index ", "}}{{component (get-link-type subject) url=subject}}{{/each}}</div>
                 </div>
               </div>
           </div>