diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl
index 1a214661b5..264ef21b57 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl
@@ -55,7 +55,7 @@ $(document).ready(function() {
 <div id="breadcrumbs">
          <a href="/cgi-bin/koha/mainpage.pl">Home</a>
 &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
-&rsaquo; <a href="<!-- TMPL_IF NAME="script_name" -->">Authority Types</a>
+&rsaquo; <a href="<!-- TMPL_VAR NAME="script_name" -->">Authority Types</a>
 <!-- TMPL_IF NAME="add_form" -->
 &rsaquo; <!-- TMPL_IF NAME="authtypecode" -->Modify<!-- TMPL_ELSE -->New<!-- /TMPL_IF --> Authority Type
 <!-- TMPL_ELSIF NAME="delete_confirm" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
index 8880f8b7be..1e9c1a66ae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
@@ -45,42 +45,42 @@ function Changefwk(FwkList) {
 
 <div id="bibliotabs" class="toptabs numbered">
 	<ul>
-            <!-- TMPL_IF name="0XX" -->
+            <!-- TMPL_IF name="zeroXX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab0XX">0</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="1XX" -->
+            <!-- TMPL_IF name="oneXX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab1XX">1</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="2XX" -->
+            <!-- TMPL_IF name="twoXX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab2XX">2</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="3XX" -->
+            <!-- TMPL_IF name="threeXX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab3XX">3</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="4XX" -->
+            <!-- TMPL_IF name="fourXX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab4XX">4</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="5XX" -->
+            <!-- TMPL_IF name="fiveXX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab5XX">5</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="6XX" -->
+            <!-- TMPL_IF name="sixXX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab6XX">6</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="7XX" -->
+            <!-- TMPL_IF name="sevenXX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab7XX">7</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="8XX" -->
+            <!-- TMPL_IF name="eightXX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab8XX">8</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="9XX" -->
+            <!-- TMPL_IF name="nineXX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab9XX">9</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="10XX" -->
+            <!-- TMPL_IF name="tenXX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab10XX">Item(s)</a></li>
             <!-- /TMPL_IF -->
         </ul>
     <div id="tab0XX">
-        <!-- TMPL_LOOP NAME="0XX" -->
+        <!-- TMPL_LOOP NAME="zeroXX" -->
             <!-- TMPL_IF name="tag" -->
                 <div class="tag">
                 <div class="tag_title">
@@ -110,7 +110,7 @@ function Changefwk(FwkList) {
     </div>
 
     <div id="tab1XX">
-        <!-- TMPL_LOOP NAME="1XX" -->
+        <!-- TMPL_LOOP NAME="oneXX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
                     <div class="tag_title">
@@ -140,7 +140,7 @@ function Changefwk(FwkList) {
     </div>
 
     <div id="tab2XX">
-        <!-- TMPL_LOOP NAME="2XX" -->
+        <!-- TMPL_LOOP NAME="twoXX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
                     <div class="tag_title">
@@ -170,7 +170,7 @@ function Changefwk(FwkList) {
     </div>
 
     <div id="tab3XX">
-        <!-- TMPL_LOOP NAME="3XX" -->
+        <!-- TMPL_LOOP NAME="threeXX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
                     <div class="tag_title">
@@ -200,7 +200,7 @@ function Changefwk(FwkList) {
     </div>
 
     <div id="tab4XX">
-        <!-- TMPL_LOOP NAME="4XX" -->
+        <!-- TMPL_LOOP NAME="fourXX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
                     <div class="tag_title">
@@ -230,7 +230,7 @@ function Changefwk(FwkList) {
     </div>
 
     <div  id="tab5XX">
-        <!-- TMPL_LOOP NAME="5XX" -->
+        <!-- TMPL_LOOP NAME="fiveXX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
                     <div class="tag_title">
@@ -260,7 +260,7 @@ function Changefwk(FwkList) {
     </div>
 
     <div id="tab6XX">
-        <!-- TMPL_LOOP NAME="6XX" -->
+        <!-- TMPL_LOOP NAME="sixXX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
                     <div class="tag_title">
@@ -290,7 +290,7 @@ function Changefwk(FwkList) {
     </div>
 
     <div  id="tab7XX">
-        <!-- TMPL_LOOP NAME="7XX" -->
+        <!-- TMPL_LOOP NAME="sevenXX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
                     <div class="tag_title">
@@ -320,7 +320,7 @@ function Changefwk(FwkList) {
     </div>
 
     <div id="tab8XX">
-        <!-- TMPL_LOOP NAME="8XX" -->
+        <!-- TMPL_LOOP NAME="eightXX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
                     <div class="tag_title">
@@ -350,7 +350,7 @@ function Changefwk(FwkList) {
     </div>
 
     <div id="tab9XX">
-        <!-- TMPL_LOOP NAME="9XX" -->
+        <!-- TMPL_LOOP NAME="nineXX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
                     <div class="tag_title">
@@ -379,7 +379,7 @@ function Changefwk(FwkList) {
         <!-- /TMPL_LOOP -->
     </div>
 
-     <!-- TMPL_IF name="10XX" -->
+     <!-- TMPL_IF name="tenXX" -->
     <div id="tab10XX">
         <table>
                 <tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tmpl
index 6230faa920..2c46be8d65 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tmpl
@@ -254,6 +254,7 @@ $(document).ready(function(){
 		<!-- /TMPL_LOOP -->
 		</ul>
 	    </div><!-- /div.record -->
+<!-- /TMPL_IF -->
     </div><!-- /div#tabrecord1 -->
     <div id="tabrecord2">
 	<!-- TMPL_IF name="record2" -->