diff --git a/src/IDF/templates/idf/source/mtn/changelog.html b/src/IDF/templates/idf/source/mtn/changelog.html
index bb3dbc5..5a6fc23 100644
--- a/src/IDF/templates/idf/source/mtn/changelog.html
+++ b/src/IDF/templates/idf/source/mtn/changelog.html
@@ -1,20 +1,24 @@
 {extends "idf/source/changelog.html"}
 {block context}
 <p><strong>{trans 'Branches:'}</strong><br/>
-{foreach $branches as $branch => $path}
-{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $branch)}
-<span class="label{if in_array($branch, $tree_in)} active{/if}"><a href="{$url}" class="label" title="{if $path}{$path}{else}{$branch}{/if}">
-    {if $path}{$path|shorten:25}{else}{$branch|shorten:25}{/if}
-</a></span><br/>
+{foreach $branches as $selector => $branch}
+{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $selector)}
+<span class="label{if in_array($branch, $tree_in)} active{/if}">
+    <a href="{$url}" class="label" title="{$branch}">
+        {$branch|shorten:25}
+    </a>
+</span><br/>
 {/foreach}
 </p>
 {if $tags}
 <p><strong>{trans 'Tags:'}</strong><br/>
-{foreach $tags as $tag => $path}
-{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $tag)}
-<span class="label{if in_array($tag, $tags_in)} active{/if}"><a href="{$url}" class="label" title="{if $path}{$path}{else}{$tag}{/if}">
-    {if $path}{$path|shorten:25}{else}{$tag|shorten:25}{/if}
-</a></span><br/>
+{foreach $tags as $selector => $tag}
+{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $selector)}
+<span class="label{if in_array($tag, $tags_in)} active{/if}">
+    <a href="{$url}" class="label" title="{$tag}">
+        {$tag|shorten:25}
+    </a>
+</span><br/>
 {/foreach}
 </p>
 {/if}
diff --git a/src/IDF/templates/idf/source/mtn/file.html b/src/IDF/templates/idf/source/mtn/file.html
index a8f4e43..6190557 100644
--- a/src/IDF/templates/idf/source/mtn/file.html
+++ b/src/IDF/templates/idf/source/mtn/file.html
@@ -23,20 +23,24 @@
 {/block}
 {block context}
 <p><strong>{trans 'Branches:'}</strong><br/>
-{foreach $branches as $branch => $path}
-{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $branch)}
-<span class="label{if in_array($branch, $tree_in)} active{/if}"><a href="{$url}" class="label" title="{if $path}{$path}{else}{$branch}{/if}">
-    {if $path}{$path|shorten:25}{else}{$branch|shorten:25}{/if}
-</a></span><br/>
+{foreach $branches as $selector => $branch}
+{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $selector)}
+<span class="label{if in_array($branch, $tree_in)} active{/if}">
+    <a href="{$url}" class="label" title="{$branch}">
+        {$branch|shorten:25}
+    </a>
+</span><br/>
 {/foreach}
 </p>
 {if $tags}
 <p><strong>{trans 'Tags:'}</strong><br/>
-{foreach $tags as $tag => $path}
-{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $tag)}
-<span class="label{if in_array($tag, $tags_in)} active{/if}"><a href="{$url}" class="label" title="{if $path}{$path}{else}{$tag}{/if}">
-    {if $path}{$path|shorten:25}{else}{$tag|shorten:25}{/if}
-</a></span><br/>
+{foreach $tags as $selector => $tag}
+{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $selector)}
+<span class="label{if in_array($tag, $tags_in)} active{/if}">
+    <a href="{$url}" class="label" title="{$tag}">
+        {$tag|shorten:25}
+    </a>
+</span><br/>
 {/foreach}
 </p>
 {/if}
diff --git a/src/IDF/templates/idf/source/mtn/tree.html b/src/IDF/templates/idf/source/mtn/tree.html
index 933f7b0..0250b01 100644
--- a/src/IDF/templates/idf/source/mtn/tree.html
+++ b/src/IDF/templates/idf/source/mtn/tree.html
@@ -56,20 +56,24 @@
 {/block}
 {block context}
 <p><strong>{trans 'Branches:'}</strong><br/>
-{foreach $branches as $branch => $path}
-{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $branch)}
-<span class="label{if in_array($branch, $tree_in)} active{/if}"><a href="{$url}" class="label" title="{if $path}{$path}{else}{$branch}{/if}">
-    {if $path}{$path|shorten:25}{else}{$branch|shorten:25}{/if}
-</a></span><br/>
+{foreach $branches as $selector => $branch}
+{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $selector)}
+<span class="label{if in_array($branch, $tree_in)} active{/if}">
+    <a href="{$url}" class="label" title="{$branch}">
+        {$branch|shorten:25}
+    </a>
+</span><br/>
 {/foreach}
 </p>
 {if $tags}
 <p><strong>{trans 'Tags:'}</strong><br/>
-{foreach $tags as $tag => $path}
-{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $tag)}
-<span class="label{if in_array($tag, $tags_in)} active{/if}"><a href="{$url}" class="label" title="{if $path}{$path}{else}{$tag}{/if}">
-    {if $path}{$path|shorten:25}{else}{$tag|shorten:25}{/if}
-</a></span><br/>
+{foreach $tags as $selector => $tag}
+{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $selector)}
+<span class="label{if in_array($tag, $tags_in)} active{/if}">
+    <a href="{$url}" class="label" title="{$tag}">
+        {$tag|shorten:25}
+    </a>
+</span><br/>
 {/foreach}
 </p>
 {/if}