--- a/templates/kit/changelogentry.tmpl	Sat Aug 12 13:29:15 2017 +0800
+++ b/templates/kit/changelogentry.tmpl	Wed Jan 24 14:03:53 2018 +0800
@@ -1,7 +1,7 @@
 <li>
   <div>
     <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{rev}:{node|short}</a>
-    {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}
+    {alltags}
   </div>
   <div>
     {author|obfuscate}, <span class="age">{date|rfc822date}</span>

--- a/templates/kit/changeset.tmpl	Sat Aug 12 13:29:15 2017 +0800
+++ b/templates/kit/changeset.tmpl	Wed Jan 24 14:03:53 2018 +0800
@@ -37,7 +37,7 @@
 
       <div>
         <a class="kit-monospace" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{rev}:{node|short}</a>
-        {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}
+        {alltags}
       </div>
       <div>{author|obfuscate}, <span class="age">{date|rfc822date}</span></div>
 

--- a/templates/kit/fileannotate.tmpl	Sat Aug 12 13:29:15 2017 +0800
+++ b/templates/kit/fileannotate.tmpl	Wed Jan 24 14:03:53 2018 +0800
@@ -25,7 +25,7 @@
     <div class="uk-clearfix uk-margin-top">
       <div>
         <a class="kit-monospace" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{rev}:{node|short}</a>
-        {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}
+        {alltags}
       </div>
       <div>{author|obfuscate}, <span class="age">{date|rfc822date}</span></div>
 

--- a/templates/kit/filecomparison.tmpl	Sat Aug 12 13:29:15 2017 +0800
+++ b/templates/kit/filecomparison.tmpl	Wed Jan 24 14:03:53 2018 +0800
@@ -25,7 +25,7 @@
     <div class="uk-clearfix uk-margin-top">
       <div>
         <a class="kit-monospace" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{rev}:{node|short}</a>
-        {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}
+        {alltags}
       </div>
       <div>{author|obfuscate}, <span class="age">{date|rfc822date}</span></div>
 

--- a/templates/kit/filediff.tmpl	Sat Aug 12 13:29:15 2017 +0800
+++ b/templates/kit/filediff.tmpl	Wed Jan 24 14:03:53 2018 +0800
@@ -25,7 +25,7 @@
     <div class="uk-clearfix uk-margin-top">
       <div>
         <a class="kit-monospace" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{rev}:{node|short}</a>
-        {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}
+        {alltags}
       </div>
       <div>{author|obfuscate}, <span class="age">{date|rfc822date}</span></div>
 

--- a/templates/kit/filerevision.tmpl	Sat Aug 12 13:29:15 2017 +0800
+++ b/templates/kit/filerevision.tmpl	Wed Jan 24 14:03:53 2018 +0800
@@ -25,7 +25,7 @@
     <div class="uk-clearfix uk-margin-top">
       <div>
         <a class="kit-monospace" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{rev}:{node|short}</a>
-        {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}
+        {alltags}
       </div>
       <div>{author|obfuscate}, <span class="age">{date|rfc822date}</span></div>
 

--- a/templates/kit/manifest.tmpl	Sat Aug 12 13:29:15 2017 +0800
+++ b/templates/kit/manifest.tmpl	Wed Jan 24 14:03:53 2018 +0800
@@ -32,7 +32,7 @@
 
       <div>
         <a class="kit-monospace" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{rev}:{node|short}</a>
-        {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}
+        {alltags}
       </div>
       <div>{author|obfuscate}, <span class="age">{date|rfc822date}</span></div>
 

--- a/templates/kit/map	Sat Aug 12 13:29:15 2017 +0800
+++ b/templates/kit/map	Wed Jan 24 14:03:53 2018 +0800
@@ -257,13 +257,14 @@
 branchtag = '<a href="{url|urlescape}shortlog/{name|revescape}{sessionvars%urlparameter}"><span class="uk-badge kit-badge-branch-head" title="A head of branch: {name|escape}">{name|escape}</span></a> '
 inbranchtag = '<a href="{url|urlescape}shortlog/{name|revescape}{sessionvars%urlparameter}"><span class="uk-badge kit-badge-branch" title="Branch: {name|escape}">{name|escape}</span></a> '
 bookmarktag = '<a href="{url|urlescape}rev/{name|revescape}{sessionvars%urlparameter}"><span class="uk-badge kit-badge-bookmark" title="Bookmark: {name|escape}">{name|escape}</span></a> '
+alltags = '<span>{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span>'
 shortlogentry = '
   <tr>
     <td class="age">{date|rfc822date}</td>
     <td>{author|person}</td>
     <td class="uk-width-1-1 uk-text-break kit-white-space-normal">
       <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a>
-      <span>{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span>
+      {alltags}
     </td>
     <td>
       <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
@@ -276,7 +277,7 @@
     <td>{author|person}</td>
     <td class="uk-width-1-1 uk-text-break kit-white-space-normal">
       <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a>
-      <span>{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span>
+      {alltags}
     </td>
     <td>
       <a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a> |