diff --git a/templates/content-tags.tpl.html b/templates/content-tags.tpl.html
index 8afc1cf..6345329 100644
--- a/templates/content-tags.tpl.html
+++ b/templates/content-tags.tpl.html
@@ -1,3 +1,4 @@
+<!--% PROCESS 'shared-utils.tpl.html' %-->
 <!--% PROCESS "queries-tags-${constants.database}.tpl.html" %-->
 <!--% USE DBI(constants.driver, constants.user, constants.password) %-->
 <!--% PERL %-->
@@ -52,14 +53,14 @@ END %-->
 	<ul class="columns3">
     <!--% FOREACH first_char IN all_first %-->
         <!--% IF all_tags.${first_char} %-->
-            <li><a href="#<!--% all_tags.${first_char}.keys.sort.first %-->"><strong><!--% first_char %--></strong></a></li>
+            <li><a href="<!--% absolute_path(baseurl) %-->tags.html#<!--% all_tags.${first_char}.keys.sort.first %-->"><strong><!--% first_char %--></strong></a></li>
         <!--% END %-->
     <!--% END %-->
 	</ul>
 	<hr>
     <!--% FOREACH first_char IN all_first %-->
         <!--% IF all_tags.${first_char} %-->
-	        <p class="ralign"><a href="#TOP">&UpArrow; Go to index</a></p>
+		<p class="ralign"><a href="<!--% absolute_path(baseurl) %-->tags.html#TOP">&UpArrow; Go to index</a></p>
 	        <h3>Tags beginning with '<!--% first_char %-->'</h3>
 	        <ul>
                 <!--% FOREACH tag IN all_tags.${first_char}.keys.sort %-->
@@ -67,7 +68,7 @@ END %-->
     	        		<a id="<!--% tag %-->"><strong><!--% tag %--></strong></a>: 
                         <!--% ep_links = [] %-->
                         <!--% FOREACH ep_id IN all_tags.${first_char}.${tag}.urls.nsort;
-    	        		    ep_links.push('<a href="./hpr' _ ep_id _ '/index.html"'
+							ep_links.push("<a href=\"${absolute_path(baseurl)}eps/hpr" _ zero_pad_left(ep_id) _ '/index.html"'
                                 ' target="_blank" aria-label="' _ tag _
                                 ' - show ' _ ep_id _ '">' _ ep_id _ '</a>');
                         END %-->