diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
index f6f790261a..603d517875 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
@@ -254,9 +254,11 @@ ff.submit();
                 <label for="budget_id">Budget: </label>
                 <select id="budget_id" onchange="fetchSortDropbox(this.form)" size="1" name="budget_id">
                 <!-- TMPL_LOOP NAME="budget_loop" -->
-                    <option value="<!-- TMPL_VAR NAME='b_id' -->"<!-- TMPL_IF NAME="b_sel" -->selected="1"<!-- /TMPL_IF --> >
-                          <!-- TMPL_VAR NAME="b_txt" -->
-                    </option>
+                    <!-- TMPL_IF NAME="b_sel" -->
+                        <option value="<!-- TMPL_VAR NAME='b_id' -->" selected="selected"><!-- TMPL_VAR NAME="b_txt" --></option>
+                    <!-- TMPL_ELSE -->
+                        <option value="<!-- TMPL_VAR NAME='b_id' -->"><!-- TMPL_VAR NAME="b_txt" --></option>
+                    <!-- /TMPL_IF -->
                 <!-- /TMPL_LOOP -->
                 </select>
                 <!--/TMPL_IF-->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tmpl
index b54d9cf9e9..95e8c6b0e8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tmpl
@@ -176,7 +176,7 @@ function Check(ff) {
             <!-- TMPL_IF NAME="delete_confirmed" -->
                 <h3>Contract Deleted</h3>
                 <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                    <input type="hidden" name="booksellerid" value="<!-- TMPL_VAR name="booksellerid" -->/>
+                    <input type="hidden" name="booksellerid" value="<!-- TMPL_VAR name="booksellerid" -->" />
                     <input type="submit" value="OK" />
                 </form>
             <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index 2c923b199d..de47e2097b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -421,7 +421,12 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
     <label for="barcode">Checking out to <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->) </label>
 	<div class="hint">Enter item barcode:</div>
 
-	<input type="text" name="barcode" id="barcode" class="barcode focus" size="14" <!-- TMPL_IF NAME="NEEDSCONFIRMATION" -->disabled="disabled"<!-- /TMPL_IF -->/> <input type="submit" value="Check Out" />
+    <!-- TMPL_IF NAME="NEEDSCONFIRMATION" -->
+	    <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" disabled="disabled" />
+    <!-- TMPL_ELSE -->
+	    <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" />
+    <!-- /TMPL_IF -->
+    <input type="submit" value="Check Out" />
 
     <!-- TMPL_IF NAME="SpecifyDueDate" --><div class="date-select">
         <div class="hint">Specify Due Date <!-- TMPL_INCLUDE NAME="date-format.inc" -->: </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl
index c43e24c2c5..44e50fe0c9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl
@@ -28,7 +28,7 @@
 Filter by area <select name="areas">
 <option value="">All</option>
 <!-- TMPL_LOOP NAME="areas" -->     
-    <!-- TMPL_IF NAME="selected">
+    <!-- TMPL_IF NAME="selected" -->
         <option value="<!-- TMPL_VAR NAME="id" -->" selected="selected" ><!-- TMPL_VAR NAME="name"--></option>
     <!-- TMPL_ELSE -->
         <option value="<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR NAME="name"--></option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl
index 8ee1e138b5..bacd1a99c3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl
@@ -27,7 +27,7 @@ function GetIt(aqbooksellerid,name)
 		<th>Select</th>
 	</tr>
 	<!-- TMPL_LOOP name="loop_suppliers" -->
-        <!-- TMPL_UNLESS name="__odd__">
+        <!-- TMPL_UNLESS name="__odd__" -->
         <tr class="highlight">
         <!-- TMPL_ELSE -->
         <tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/merge.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/merge.tmpl
index a189a57a10..c5357447f6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/merge.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/merge.tmpl
@@ -5,7 +5,7 @@
 
 <h1> <!-- TMPL_VAR NAME="session" --> </h1>
 
-<!-- TMPL_IF fields ><!-- TMPL_INCLUDE NAME="virtualshelves/merge/selection.tmpl" -->
+<!-- TMPL_IF NAME="fields" --><!-- TMPL_INCLUDE NAME="virtualshelves/merge/selection.tmpl" -->
 <!-- TMPL_ELSE -->
 <h1>DOIT</h1><pre><!-- TMPL_VAR NAME="new" --></pre>
 <h1>ITEMS</h1><pre><!-- TMPL_VAR NAME="items" --></pre>