diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/ISBDdetail.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/ISBDdetail.tmpl
index e2f07b7771..bd0def5a6a 100644
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/ISBDdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/ISBDdetail.tmpl
@@ -1,20 +1,20 @@
 <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
 <div id="mainbloc">
 	<div id="bibliomenu">
-		<a href="detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
+		<a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
 			Normal
 		</a>
-		<a href="MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
+		<a href="MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
 			MARC
 		</a>
-		<a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
+		<a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
 			Add to shelf
 		</a>
-		<a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
+		<a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
 			Print
 		</a>
-		<!-- TMPL_UNLESS NAME="norequests" -->
+		<!-- TMPL_UNLESS name="norequests" -->
 			<a class="button catalogue" href="/cgi-bin/koha/reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
 				Request
 			</a>
@@ -23,10 +23,10 @@
 
 	<div id="bloc100">
 		<h2 class="catalogue">ISBD</h2>
-		<p>ISBD : <!-- TMPL_VAR name="ISBD" --></p>
+		<p>ISBD : <!-- TMPL_VAR NAME="ISBD" --></p>
 	</div>
 </div>
-<script>
+<script language="javascript" type="text/javascript">
 function Dopop(link) {
 	newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
 }
diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl
index 68e353cedd..d007fec42c 100644
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl
@@ -1,251 +1,251 @@
 <!-- TMPL_INCLUDE NAME="marc-top.inc" -->
 
 <div class="tabbed">
-	<h1 class="catalogue">MARC biblio : <!-- TMPL_VAR name="bibid" --></h1>
-	<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR name="biblionumber" -->">
-		<img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png" alt="Edit this Record">
+	<h1 class="catalogue">MARC biblio : <!-- TMPL_VAR NAME="bibid" --></h1>
+	<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png" alt="Edit this Record">
 	</a>
 	<a href="javascript:confirm_deletion()">
-		<img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" alt="Delete this Record">
+		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" alt="Delete this Record">
 	</a>
-	<a href="detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
+	<a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
 		Normal
 	</a>
-	<a href="ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
+	<a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
 		ISBD
 	</a>
-	<a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
+	<a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
 		Add to shelf
 	</a>
-	<a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
+	<a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
 		Print
 	</a>
 
 	<!-- TMPL_IF NAME="norequests" -->
 	<!-- TMPL_ELSE -->
-		<a href=request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" --> class="button catalogue">Request</a>
+		<a href="request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Request</a>
 	<!-- /TMPL_IF -->
 </div>
 
 	<div class="tabs">
-		<!-- TMPL_IF name="0XX" -->
+		<!-- TMPL_IF NAME="0XX" -->
 			<div id="link0"><a href="javascript:active(0)">0</a></div>
 		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="1XX" -->
+		<!-- TMPL_IF NAME="1XX" -->
 			<div id="link1"><a href="javascript:active(1)">1</a></div>
 		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="2XX" -->
+		<!-- TMPL_IF NAME="2XX" -->
 			<div id="link2"><a href="javascript:active(2)">2</a></div>
 		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="3XX" -->
+		<!-- TMPL_IF NAME="3XX" -->
 			<div id="link3"><a href="javascript:active(3)">3</a></div>
 		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="4XX" -->
+		<!-- TMPL_IF NAME="4XX" -->
 			<div id="link4"><a href="javascript:active(4)">4</a></div>
 		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="5XX" -->
+		<!-- TMPL_IF NAME="5XX" -->
 			<div id="link5"><a href="javascript:active(5)">5</a></div>
 		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="6XX" -->
+		<!-- TMPL_IF NAME="6XX" -->
 			<div id="link6"><a href="javascript:active(6)">6</a></div>
 		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="7XX" -->
+		<!-- TMPL_IF NAME="7XX" -->
 			<div id="link7"><a href="javascript:active(7)">7</a></div>
 		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="8XX" -->
+		<!-- TMPL_IF NAME="8XX" -->
 			<div id="link8"><a href="javascript:active(8)">8</a></div>
 		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="9XX" -->
+		<!-- TMPL_IF NAME="9XX" -->
 			<div id="link9"><a href="javascript:active(9)">9</a></div>
 		<!-- /TMPL_IF -->
 		<a href="javascript:active(10)">I<br>t<br>e<br>m<br>s</a>
 	</div>
 
 	<div name="0XX" id="0XX" class="tab" style="visibility:visible">
-		<!-- TMPL_LOOP name="0XX" -->
+		<!-- TMPL_LOOP NAME="0XX" -->
 				<p class="MARCtag">
-					<!-- TMPL_VAR name="tag" -->
+					<!-- TMPL_VAR NAME="tag" -->
 				</p>
-			<!-- TMPL_LOOP name="subfield" -->
+			<!-- TMPL_LOOP NAME="subfield" -->
 				<p>
 					<label class="labelsubfield">
-					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR name="marc_value" ESCAPE=URL -->">
-						<img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
+					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
 					</a>
-					<!-- TMPL_VAR name="marc_subfield" -->
-					<!-- TMPL_VAR name="marc_lib" --></label>
-					<!-- TMPL_VAR name="marc_value" -->
+					<!-- TMPL_VAR NAME="marc_subfield" -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" -->
 				</p>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_LOOP -->
 	</div>
 	
 	<div id="1XX" class="tab">
-		<!-- TMPL_LOOP name="1XX" -->
+		<!-- TMPL_LOOP NAME="1XX" -->
 				<p class="MARCtag">
-					<!-- TMPL_VAR name="tag" -->
+					<!-- TMPL_VAR NAME="tag" -->
 				</p>
-			<!-- TMPL_LOOP name="subfield" -->
+			<!-- TMPL_LOOP NAME="subfield" -->
 				<p>
 					<label class="labelsubfield">
-					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR name="marc_value" ESCAPE=URL -->">
-						<img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
+					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
 					</a>
-					<!-- TMPL_VAR name="marc_subfield" -->
-					<!-- TMPL_VAR name="marc_lib" --></label>
-					<!-- TMPL_VAR name="marc_value" -->
+					<!-- TMPL_VAR NAME="marc_subfield" -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" -->
 				</p>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_LOOP -->
 	</div>
 	
 	<div id="2XX" class="tab">
-		<!-- TMPL_LOOP name="2XX" -->
+		<!-- TMPL_LOOP NAME="2XX" -->
 				<p class="MARCtag">
-					<!-- TMPL_VAR name="tag" -->
+					<!-- TMPL_VAR NAME="tag" -->
 				</p>
-			<!-- TMPL_LOOP name="subfield" -->
+			<!-- TMPL_LOOP NAME="subfield" -->
 				<p>
 					<label class="labelsubfield">
-					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR name="marc_value" ESCAPE=URL -->">
-						<img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
+					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
 					</a>
-					<!-- TMPL_VAR name="marc_subfield" -->
-					<!-- TMPL_VAR name="marc_lib" --></label>
-					<!-- TMPL_VAR name="marc_value" -->
+					<!-- TMPL_VAR NAME="marc_subfield" -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" -->
 				</p>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_LOOP -->
 	</div>
 	
 	<div id="3XX" class="tab">
-		<!-- TMPL_LOOP name="3XX" -->
+		<!-- TMPL_LOOP NAME="3XX" -->
 				<p class="MARCtag">
-					<!-- TMPL_VAR name="tag" -->
+					<!-- TMPL_VAR NAME="tag" -->
 				</p>
-			<!-- TMPL_LOOP name="subfield" -->
+			<!-- TMPL_LOOP NAME="subfield" -->
 				<p>
 					<label class="labelsubfield">
-					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR name="marc_value" ESCAPE=URL -->">
-						<img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
+					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
 					</a>
-					<!-- TMPL_VAR name="marc_subfield" -->
-					<!-- TMPL_VAR name="marc_lib" --></label>
-					<!-- TMPL_VAR name="marc_value" -->
+					<!-- TMPL_VAR NAME="marc_subfield" -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" -->
 				</p>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_LOOP -->
 	</div>
 	
 	<div id="4XX" class="tab">
-		<!-- TMPL_LOOP name="4XX" -->
+		<!-- TMPL_LOOP NAME="4XX" -->
 				<p class="MARCtag">
-					<!-- TMPL_VAR name="tag" -->
+					<!-- TMPL_VAR NAME="tag" -->
 				</p>
-			<!-- TMPL_LOOP name="subfield" -->
+			<!-- TMPL_LOOP NAME="subfield" -->
 				<p>
 					<label class="labelsubfield">
-					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR name="marc_value" ESCAPE=URL -->">
-						<img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
+					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
 					</a>
-					<!-- TMPL_VAR name="marc_subfield" -->
-					<!-- TMPL_VAR name="marc_lib" --></label>
-					<!-- TMPL_VAR name="marc_value" -->
+					<!-- TMPL_VAR NAME="marc_subfield" -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" -->
 				</p>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_LOOP -->
 	</div>
 	
 	<div  id="5XX" class="tab">
-		<!-- TMPL_LOOP name="5XX" -->
+		<!-- TMPL_LOOP NAME="5XX" -->
 				<p class="MARCtag">
-					<!-- TMPL_VAR name="tag" -->
+					<!-- TMPL_VAR NAME="tag" -->
 				</p>
-			<!-- TMPL_LOOP name="subfield" -->
+			<!-- TMPL_LOOP NAME="subfield" -->
 				<p>
 					<label class="labelsubfield">
-					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR name="marc_value" ESCAPE=URL -->">
-						<img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
+					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
 					</a>
-					<!-- TMPL_VAR name="marc_subfield" -->
-					<!-- TMPL_VAR name="marc_lib" --></label>
-					<!-- TMPL_VAR name="marc_value" -->
+					<!-- TMPL_VAR NAME="marc_subfield" -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" -->
 				</p>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_LOOP -->
 	</div>
 	
 	<div id="6XX" class="tab">
-		<!-- TMPL_LOOP name="6XX" -->
+		<!-- TMPL_LOOP NAME="6XX" -->
 				<p class="MARCtag">
-					<!-- TMPL_VAR name="tag" -->
+					<!-- TMPL_VAR NAME="tag" -->
 				</p>
-			<!-- TMPL_LOOP name="subfield" -->
+			<!-- TMPL_LOOP NAME="subfield" -->
 				<p>
 					<label class="labelsubfield">
-					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR name="marc_value" ESCAPE=URL -->">
-						<img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
+					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
 					</a>
-					<!-- TMPL_VAR name="marc_subfield" -->
-					<!-- TMPL_VAR name="marc_lib" --></label>
-					<!-- TMPL_VAR name="marc_value" -->
+					<!-- TMPL_VAR NAME="marc_subfield" -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" -->
 				</p>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_LOOP -->
 	</div>
 	
 	<div  id="7XX" class="tab">
-		<!-- TMPL_LOOP name="7XX" -->
+		<!-- TMPL_LOOP NAME="7XX" -->
 				<p class="MARCtag">
-					<!-- TMPL_VAR name="tag" -->
+					<!-- TMPL_VAR NAME="tag" -->
 				</p>
-			<!-- TMPL_LOOP name="subfield" -->
+			<!-- TMPL_LOOP NAME="subfield" -->
 				<p>
 					<label class="labelsubfield">
-					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR name="marc_value" ESCAPE=URL -->">
-						<img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
+					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
 					</a>
-					<!-- TMPL_VAR name="marc_subfield" -->
-					<!-- TMPL_VAR name="marc_lib" --></label>
-					<!-- TMPL_VAR name="marc_value" -->
+					<!-- TMPL_VAR NAME="marc_subfield" -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" -->
 				</p>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_LOOP -->
 	</div>
 	
 	<div id="8XX" class="tab">
-		<!-- TMPL_LOOP name="8XX" -->
+		<!-- TMPL_LOOP NAME="8XX" -->
 				<p class="MARCtag">
-					<!-- TMPL_VAR name="tag" -->
+					<!-- TMPL_VAR NAME="tag" -->
 				</p>
-			<!-- TMPL_LOOP name="subfield" -->
+			<!-- TMPL_LOOP NAME="subfield" -->
 				<p>
 					<label class="labelsubfield">
-					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR name="marc_value" ESCAPE=URL -->">
-						<img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
+					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
 					</a>
-					<!-- TMPL_VAR name="marc_subfield" -->
-					<!-- TMPL_VAR name="marc_lib" --></label>
-					<!-- TMPL_VAR name="marc_value" -->
+					<!-- TMPL_VAR NAME="marc_subfield" -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" -->
 				</p>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_LOOP -->
 	</div>
 	
 	<div id="9XX" class="tab">
-		<!-- TMPL_LOOP name="9XX" -->
+		<!-- TMPL_LOOP NAME="9XX" -->
 				<p class="MARCtag">
-					<!-- TMPL_VAR name="tag" -->
+					<!-- TMPL_VAR NAME="tag" -->
 				</p>
-			<!-- TMPL_LOOP name="subfield" -->
+			<!-- TMPL_LOOP NAME="subfield" -->
 				<p>
 					<label class="labelsubfield">
-					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR name="marc_value" ESCAPE=URL -->">
-						<img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
+					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
 					</a>
-					<!-- TMPL_VAR name="marc_subfield" -->
-					<!-- TMPL_VAR name="marc_lib" --></label>
-					<!-- TMPL_VAR name="marc_value" -->
+					<!-- TMPL_VAR NAME="marc_subfield" -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" -->
 				</p>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_LOOP -->
@@ -256,15 +256,15 @@
 		<br/>
 		<table class="noborder">
 				<tr>
-					<!-- TMPL_LOOP name="item_header_loop" -->
+					<!-- TMPL_LOOP NAME="item_header_loop" -->
 						<th class="noborder">
-							<!-- TMPL_VAR name="header_value" -->
+							<!-- TMPL_VAR NAME="header_value" -->
 						</th>
 					<!-- /TMPL_LOOP -->
 				</tr>
-				<!-- TMPL_LOOP name="item_loop" -->
+				<!-- TMPL_LOOP NAME="item_loop" -->
 					<tr>
-						<!-- TMPL_VAR name="item_value" -->
+						<!-- TMPL_VAR NAME="item_value" -->
 					</tr>
 				<!-- /TMPL_LOOP -->
 		</table>
@@ -286,7 +286,7 @@ function active(numlayer)
 function confirm_deletion() {
 	var is_confirmed = confirm('Are you sure you want to delete this biblio?');
 	if (is_confirmed) {
-		window.location="acqui.simple/addbiblio.pl?op=delete&bibid=<!-- TMPL_VAR name="bibid" -->";
+		window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";
 	}
 }
 function Dopop(link) {
diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl
index 29b93e32da..d297235375 100644
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl
@@ -1,110 +1,110 @@
-<!-- TMPL_IF name="opac" -->
+<!-- TMPL_IF NAME="opac" -->
 	<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
 <!-- TMPL_ELSE -->
 	<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 <!-- /TMPL_IF -->
 
 <!------------------------ MAIN BODY OF PAGE ---------------------------->
-<FORM ACTION="/cgi-bin/koha/search.pl" method=post>
+<form action="/cgi-bin/koha/search.pl" method="post">
 
 <h1>Catalogue Search</h1>
 
-<CENTER>
+<center>
 
-<TABLE align="left" width="40%" cellspacing=0 cellpadding=5 border=0 >
-	<TR VALIGN=TOP>
-		<TD>Barcode</TD>
-		<TD><INPUT TYPE="text"  SIZE="25"   NAME="itemnumber"></td>
-		<td><b> &nbsp; &nbsp; OR</b></TD></TR>
-	<!-- <TR VALIGN=TOP>
-	<TD>ISBN</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="isbn"></TD></TR>
+<table align="left" width="40%" cellspacing="0" cellpadding="5" border="0" >
+	<tr valign="top">
+		<td>Barcode</td>
+		<td><input type="text"  size="25"   name="itemnumber"></td>
+		<td><b> &nbsp; &nbsp; OR</b></td></tr>
+	<!-- <tr valign="top">
+	<td>ISBN</td> <td><input type="text"  size="25"   name="isbn"></td></tr>
 	-->
-	<TR VALIGN=TOP>
-		<TD colspan=2 > &nbsp;</td>
-	</TR>
-	<TR VALIGN=TOP>
-		<TD  bgcolor="#ad11ad" colspan=2>
+	<tr valign="top">
+		<td colspan="2" > &nbsp;</td>
+	</tr>
+	<tr valign="top">
+		<td  bgcolor="#ad11ad" colspan="2">
 			<span style="color:#FFFFFF;">
 				<b>HELP</b><br>
 				<b>Search :</b>Using more fields for your search will slow it down.<p>
 			</span>
 		</td>
-	</TR>
+	</tr>
 </table>
 
 
 
-<TABLE border=0>
-	<TR VALIGN=TOP>
-		<TD>Keywords</TD>
-		<TD><INPUT TYPE="text"  SIZE="25"   NAME="keyword"></TD>
-	</TR>
-	<TR VALIGN=TOP>
-		<TD>Title</TD>
-		<TD><INPUT TYPE="text"  SIZE="25" NAME="title"></TD>
+<table border="0">
+	<tr valign="top">
+		<td>Keywords</td>
+		<td><input type="text"  size="25"   name="keyword"></td>
+	</tr>
+	<tr valign="top">
+		<td>Title</td>
+		<td><input type="text"  size="25" name="title"></td>
 		<td>
-			<input type=radio name=ttype value=normal checked>Normal
-			<input type=radio name=ttype value=exact>Exact
+			<input type="radio" name="ttype" value="normal" checked>Normal
+			<input type="radio" name="ttype" value="exact">Exact
 		</td>
-	</TR>
-	<TR VALIGN=TOP>
-		<TD>Author</TD>
-		<TD><INPUT TYPE="text"  SIZE="25"   NAME="author"></TD>
-	</TR>
-	<TR VALIGN=TOP>
-		<TD>Illustrator</TD>
-		<TD><INPUT TYPE="text"  SIZE="25"   NAME="illustrator"></TD>
-	</TR>
-		<TR VALIGN=TOP>
-		<TD>Dewey</TD><TD><INPUT TYPE="text"  SIZE="25"   NAME="dewey"></TD>
-	</TR>
+	</tr>
+	<tr valign="top">
+		<td>Author</td>
+		<td><input type="text"  size="25"   name="author"></td>
+	</tr>
+	<tr valign="top">
+		<td>Illustrator</td>
+		<td><input type="text"  size="25"   name="illustrator"></td>
+	</tr>
+		<tr valign="top">
+		<td>Dewey</td><td><input type="text"  size="25"   name="dewey"></td>
+	</tr>
 
-	<TR VALIGN=TOP>
-	<TD>Class</TD>
+	<tr valign="top">
+	<td>Class</td>
 		<td>
 			<select name="class" size="1">
 			<option value=""> Any
-			<!-- TMPL_VAR name="classlist" -->
+			<!-- TMPL_VAR NAME="classlist" -->
 			</select>
 		</td>
 	</tr>
-	<!-- <TR VALIGN=TOP>
-	<td>Branch</td><td><select name=branch>
+	<!-- <tr valign="top">
+	<td>Branch</td><td><select name="branch">
 	<option value="F">Foxton
 	</select>
 	</td></tr> -->
 
-	<!-- <TD>Pub Date (before)</TD> <TD><INPUT TYPE="text"  SIZE="8"   NAME="date-before"> &nbsp; &nbsp; (after) <INPUT TYPE="text"  SIZE="8"   NAME="date-after"></TD></TR>
+	<!-- <td>Pub Date (before)</td> <td><input type="text"  size="8"   name="date-before"> &nbsp; &nbsp; (after) <input type="text"  size="8"   name="date-after"></td></tr>
 	-->
-	<TR VALIGN=TOP>
-	<TD><b>OR</b></TD>
-	</TR>
+	<tr valign="top">
+	<td><b>OR</b></td>
+	</tr>
 
-	<TR VALIGN=TOP>
-		<TD>Subject</TD>
-		<TD><INPUT TYPE="text"  SIZE="25"   NAME="subject"></TD>
-	</TR>
+	<tr valign="top">
+		<td>Subject</td>
+		<td><input type="text"  size="25"   name="subject"></td>
+	</tr>
 	<tr>
-		<TD colspan=3>
-			<table width="100%" cellpadding=0 cellspacing=0>
+		<td colspan="3">
+			<table width="100%" cellpadding="0" cellspacing="0">
 				<tr align="center">
 					<td>
 						<input type="hidden" name="type" value="intra">
 						<input type="submit" class="button" value="Start search">
 					</td>
 					<td>
-						<INPUT TYPE="reset"  VALUE= "Clear" class="button">
+						<input type="reset"  value= "Clear" class="button">
 					</td>
 					<td>
 						<a href="/cgi-bin/koha/shelves.pl" class="button">Virtual Bookshelves</a>
 					</td>
 				</tr>
 			</table>
-		</TD>
-	</TR>
-</TABLE>
-	</FORM>
+		</td>
+	</tr>
+</table>
+	</form>
 	<p>
-	</CENTER>
-<!--#include virtual="/includes/cat-bottom.inc" -->
+	</center>
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/cmsdsearchresults.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/cmsdsearchresults.tmpl
index 53b9621f5b..6f0c3df355 100644
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/cmsdsearchresults.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/cmsdsearchresults.tmpl
@@ -3,21 +3,21 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="searchheader.tmpl" -->
-<table border=0 cellspacing=0 cellpadding=0>
-<tr bgcolor=#ccccff><th>Title</th><th>Author</th><th>Dewey</th></tr>
-<!-- TMPL_LOOP NAME=SEARCH_RESULTS -->
+<table border="0" cellspacing="0" cellpadding="0">
+<tr bgcolor="#ccccff"><th>Title</th><th>Author</th><th>Dewey</th></tr>
+<!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
   <tr>
-  <td><!-- TMPL_VAR NAME=title --></td>
-  <td><!-- TMPL_VAR NAME=author --></td>
-  <td align=right><!-- TMPL_VAR NAME=dewey --></td>
+  <td><!-- TMPL_VAR NAME="title" --></td>
+  <td><!-- TMPL_VAR NAME="author" --></td>
+  <td align="right"><!-- TMPL_VAR NAME="dewey" --></td>
   </tr>
 <!-- /TMPL_LOOP -->
-<tr><td colspan=3 bgcolor=#ccccff>
-    <table border=0 cellpadding=0 cellspacing=0 width=100%>
-    <tr><td align=left>
-    <a href=search.pl?template=<!-- TMPL_VAR NAME="template" -->&startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->>Previous Records</a>
-    </td><td align=right>
-    <a href=search.pl?template=<!-- TMPL_VAR NAME="template" -->&startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->>Next Records</a>
+<tr><td colspan="3" bgcolor="#ccccff">
+    <table border="0" cellpadding="0" cellspacing="0" width="100%">
+    <tr><td align="left">
+    <a href="search.pl?template=<!-- TMPL_VAR NAME="template" -->&amp;startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->">Previous Records</a>
+    </td><td align="right">
+    <a href="search.pl?template=<!-- TMPL_VAR NAME="template" -->&amp;startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->">Next Records</a>
     </td></tr>
     </table>
 </td></tr>
diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl
index f82552be26..712ae326b1 100644
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl
@@ -2,11 +2,11 @@
 
 
 <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
-<font SIZE=6><em><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->)
+<font size="6"><em><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->)
 <!-- TMPL_VAR NAME="class" --></em></font><p>
 <!-- FIXME - "callpadding" should be "cellpadding", right? -->
 <table cellspacing="0" callpadding="5" border="1" align="left" width="220">
-<!-----------------BIBLIO RECORD TABLE--------->
+<!-- ---------------BIBLIO RECORD TABLE------- -->
 <tr valign="top">
 
 <td bgcolor="#99cccc">
@@ -18,7 +18,7 @@
 <tr valign="top">
 <td>
 <br>
-<FONT SIZE=2  face="arial, helvetica">
+<font size="2"  face="arial, helvetica">
 <b>Subtitle:</b> <!-- TMPL_VAR NAME="subtitle" --><br>
 <b>Author:</b> <!-- TMPL_VAR NAME="author" --><br>
 <b>Additional Author:</b> <!-- TMPL_VAR NAME="additional" --><br>
@@ -35,7 +35,7 @@
 </table>
 <!-- /TMPL_LOOP -->
 <center>
-<table border=0 cellspacing=0 cellpadding=2>
+<table border="0" cellspacing="0" cellpadding="2">
 <tr bgcolor="#99cccc">
 <td>Item type</td>
 <td>Class</td>
@@ -60,14 +60,14 @@
 <td>Available</td>
 <td></td>
 <td><a href="/cgi-bin/koha/moredetail.pl?item=<TMPL_VAR
-NAME="itemnumber">&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<TMPL_VAR
-NAME="biblioitemnumber">">http://<!-- TMPL_VAR NAME="url" --></a></td>
+name="itemnumber">&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<TMPL_VAR
+name="biblioitemnumber">">http://<!-- TMPL_VAR NAME="url" --></a></td>
 </tr>
 <!-- /TMPL_LOOP -->
 </table>
 <p>
 </center>
-<br clear=all>
+<br clear="all">
 <p />
 <p />
 
diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl
index c7c83187ba..c311d7eccd 100644
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl
@@ -3,41 +3,41 @@
 <div id="mainbloc">
 <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
 	<h1 class="catalogue"><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->) <!-- TMPL_VAR NAME="class" --></h1>
-	<a href="MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">MARC</a>
-	<a href="ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
+	<a href="MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">MARC</a>
+	<a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
 		ISBD
 	</a>
-	<a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
+	<a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
 		Add to shelf
 	</a>
-	<a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
+	<a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
 		Print
 	</a>
 	<!-- TMPL_IF NAME="norequests" -->
 	<!-- TMPL_ELSE -->
-		<a class="button catalogue" href=request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->>Requests</a>
+		<a class="button catalogue" href="request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Requests</a>
 	<!-- /TMPL_IF -->
 	<div id="bloc25">
 		<h2 class="catalogue">BIBLIO RECORD <!-- TMPL_VAR NAME="biblionumber" --></h2>
 		<p>
-			<!-- TMPL_IF name="isbn" --><b>ISBN:</b><a href="/cgi-bin/koha/opac-searchresults.pl?isbn=<!-- TMPL_VAR NAME="isbn" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="ISBN" --></a><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="subtitle" --><b>Subtitle:</b><!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="author" --><b>Author:</b> <a href="/cgi-bin/koha/opac-searchresults.pl?author=<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="author" --></a><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="additional" --><b>Additional Author:</b><!-- TMPL_VAR NAME="additional" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="publishercode" --><b>Published by :</b><!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
-			<!-- TMPL_IF name="publicationyear" --><b>in </b><!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF -->
-			<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
-			<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br>
-			<!-- TMPL_IF name="collection" --><b>Collection:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="subject" --><b>Subject:</b> <!-- TMPL_VAR NAME="subject" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="copyrightdate" --><b>Year :</b> <!-- TMPL_VAR NAME="copyrightdate" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="notes" --><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="unititle" --><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --><!-- /TMPL_IF --> <br>
-			<!-- TMPL_IF name="serial" --><b>Serial:</b><!-- TMPL_VAR NAME="serial" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="dewey" --><b>Dewey:</b> <a href="/cgi-bin/koha/opac-searchresults.pl?type=opac&dewey=<!-- TMPL_VAR NAME="dewey" ESCAPE="URL" -->"><!-- TMPL_VAR name="dewey" --></a><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="classification" --><b>Classification:</b> <!-- TMPL_VAR name="classification" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="lccn" --><b>LCCN:</b> <!-- TMPL_VAR name="lccn" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF NAME="isbn" --><b>ISBN:</b><a href="/cgi-bin/koha/opac-searchresults.pl?isbn=<!-- TMPL_VAR NAME="isbn" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="ISBN" --></a><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF NAME="subtitle" --><b>Subtitle:</b><!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF NAME="author" --><b>Author:</b> <a href="/cgi-bin/koha/opac-searchresults.pl?author=<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="author" --></a><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF NAME="additional" --><b>Additional Author:</b><!-- TMPL_VAR NAME="additional" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF NAME="publishercode" --><b>Published by :</b><!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="publicationyear" --><b>in </b><!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR NAME="pages" -->
+			<!-- TMPL_IF NAME="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR NAME="size" --><br>
+			<!-- TMPL_IF NAME="collection" --><b>Collection:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF NAME="subject" --><b>Subject:</b> <!-- TMPL_VAR NAME="subject" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF NAME="copyrightdate" --><b>Year :</b> <!-- TMPL_VAR NAME="copyrightdate" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF NAME="notes" --><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF NAME="unititle" --><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --><!-- /TMPL_IF --> <br>
+			<!-- TMPL_IF NAME="serial" --><b>Serial:</b><!-- TMPL_VAR NAME="serial" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF NAME="dewey" --><b>Dewey:</b> <a href="/cgi-bin/koha/opac-searchresults.pl?type=opac&amp;dewey=<!-- TMPL_VAR NAME="dewey" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="dewey" --></a><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF NAME="classification" --><b>Classification:</b> <!-- TMPL_VAR NAME="classification" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF NAME="lccn" --><b>LCCN:</b> <!-- TMPL_VAR NAME="lccn" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF NAME="url" --><b>URL:</b> <a href="<!-- TMPL_VAR NAME="url" -->"><!-- TMPL_VAR NAME="url" --></a><!-- /TMPL_IF --><br>
 			<b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" -->
 	</div>
 <!-- /TMPL_LOOP -->
@@ -55,14 +55,14 @@
 		<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
 			<tr>
 				<td><!-- TMPL_VAR NAME="description" --></td>
-				<td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_IF name="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- /TMPL_IF --></td>
+				<td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_IF NAME="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- /TMPL_IF --></td>
 				<td><!-- TMPL_VAR NAME="datedue" --></td>
 				<td><!-- TMPL_VAR NAME="datelastseen" --></td>
-				<td><a href="/cgi-bin/koha/moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&item=<!-- TMPL_VAR NAME="itemnumber" -->&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
+				<td><a href="/cgi-bin/koha/moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
 				<td><!-- TMPL_VAR NAME="volumeddesc" --></td>
 				<!-- TMPL_IF NAME="type" -->
 					<td>
-						<a href=/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&item=<!-- TMPL_VAR NAME="itemtype" -->>Fix Itemtype</a>
+						<a href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;item=<!-- TMPL_VAR NAME="itemtype" -->">Fix Itemtype</a>
 					</td>
 				<!-- /TMPL_IF -->
 			</tr>
@@ -75,13 +75,13 @@
 				<td>Available</td>
 				<td></td>
 				<td>
-					<a href="/cgi-bin/koha/moredetail.pl?item=<!-- TMPL_VAR NAME="itemnumber -->&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->">http://<!-- TMPL_VAR NAME="url" --></a>
+					<a href="/cgi-bin/koha/moredetail.pl?item=<!-- TMPL_VAR NAME="itemnumber -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->">http://<!-- TMPL_VAR NAME="url" --></a>
 				</td>
 			</tr>
 		<!-- /TMPL_LOOP -->
 	</table>
 </div>
-<script>
+<script language="javascript" type="text/javascript">
 function Dopop(link) {
 	newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
 }
diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/detailprint.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/detailprint.tmpl
index 5b1016566a..caa39c744e 100644
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/detailprint.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/detailprint.tmpl
@@ -12,19 +12,19 @@
 			<!-- TMPL_VAR NAME="author" --><br>
 			<b><!-- TMPL_VAR NAME="title" --></b><!-- TMPL_VAR NAME="subtitle" --><br>
 			<!-- TMPL_VAR NAME="additional" --><br>
-			<!-- TMPL_IF name="publishercode" --><b>Published by :</b><!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
-			<!-- TMPL_IF name="publicationyear" --><b>in </b><!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF -->
-			<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
-			<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br>
-			<!-- TMPL_IF name="collection" --><b>Collection:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="subject" --><b>Subject:</b> <!-- TMPL_VAR NAME="subject" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="copyrightdate" --><b>Year :</b> <!-- TMPL_VAR NAME="copyrightdate" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="notes" --><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="unititle" --><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --><!-- /TMPL_IF --> <br>
-			<!-- TMPL_IF name="dewey" --><b>Dewey:</b> <a href="/cgi-bin/koha/opac-searchresults.pl?type=opac&dewey=<!-- TMPL_VAR NAME="dewey" ESCAPE="URL" -->"><!-- TMPL_VAR name="dewey" --></a><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="classification" --><b>Classification:</b> <!-- TMPL_VAR name="classification" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="lccn" --><b>LCCN:</b> <!-- TMPL_VAR name="lccn" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF NAME="publishercode" --><b>Published by :</b><!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="publicationyear" --><b>in </b><!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR NAME="pages" -->
+			<!-- TMPL_IF NAME="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR NAME="size" --><br>
+			<!-- TMPL_IF NAME="collection" --><b>Collection:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF NAME="subject" --><b>Subject:</b> <!-- TMPL_VAR NAME="subject" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF NAME="copyrightdate" --><b>Year :</b> <!-- TMPL_VAR NAME="copyrightdate" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF NAME="notes" --><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF NAME="unititle" --><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --><!-- /TMPL_IF --> <br>
+			<!-- TMPL_IF NAME="dewey" --><b>Dewey:</b> <a href="/cgi-bin/koha/opac-searchresults.pl?type=opac&amp;dewey=<!-- TMPL_VAR NAME="dewey" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="dewey" --></a><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF NAME="classification" --><b>Classification:</b> <!-- TMPL_VAR NAME="classification" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF NAME="lccn" --><b>LCCN:</b> <!-- TMPL_VAR NAME="lccn" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF NAME="url" --><b>URL:</b> <a href="<!-- TMPL_VAR NAME="url" -->"><!-- TMPL_VAR NAME="url" --></a><!-- /TMPL_IF --><br>
 			<b>ISBN:</b><!-- TMPL_VAR NAME="ISBN" --><br>
 			</font>
 		</td>
@@ -32,7 +32,7 @@
 	</table>
 <!-- /TMPL_LOOP -->
 
-<table border=0 cellspacing=0 cellpadding=2>
+<table border="0" cellspacing="0" cellpadding="2">
 	<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
 		<tr>
 			<td><!-- TMPL_VAR NAME="description" --></td>
@@ -42,11 +42,11 @@
 		</tr>
 	<!-- /TMPL_LOOP -->
 </table>
-<SCRIPT>
+<script language="javascript" type="text/javascript">
 function docprint() {
 	window.print();
 	window.close();
 }
-</SCRIPT>
+</script>
 </body>
 </html>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl
index dcfa7b1717..74d5d29450 100644
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl
@@ -4,14 +4,14 @@
 	<div id="bloc25">
 	<!-- TMPL_LOOP NAME="BIBITEM_DATA" -->
 		<h2 class="catalogue">
-			<a href=/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&type=intra>
+			<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra">
 				<!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->)
 			</a>
 		</h2>
 		<p>
-		<form action=/cgi-bin/koha/modbibitem.pl>
-			<input type=hidden name=bibitem value=<!-- TMPL_VAR NAME="biblioitemnumber" -->>
-			<input type=hidden name=biblio value=<!-- TMPL_VAR NAME="biblionumber" -->>
+		<form action="/cgi-bin/koha/modbibitem.pl" method="post">
+			<input type="hidden" name="bibitem" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
+			<input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblionumber" -->">
 			<p><!-- TMPL_VAR NAME="biblioitemnumber" --> GROUP - <!-- TMPL_VAR NAME="description" --> </p>
 			<p><b>Biblionumber:</b> <!-- TMPL_VAR NAME="biblionumber" --></p>
 			<p><b>Item type:</b> <!-- TMPL_VAR NAME="itemtype" --></p>
@@ -30,20 +30,20 @@
 			<p><b>Notes:</b> <!-- TMPL_VAR NAME="bnotes" --></p>
 			<p><b>No. of Items:</b> <!-- TMPL_VAR NAME="count" --></p>
 		</form>
-		<input type="image" name="submit"  VALUE="modify" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png">
-		<input type="image" name="delete"  VALUE="delete" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png">
-		<a class="button" href=/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->>Requests</a>
+		<input type="image" name="submit"  VALUE="modify" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
+		<input type="image" name="delete"  VALUE="delete" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png">
+		<a class="button" href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Requests</a>
 	<!-- /TMPL_LOOP -->
 	</div>
 <!-- TMPL_LOOP NAME="ITEM_DATA" -->
 <div id="bloc25">
 	<h2 class="catalogue">BARCODE <!-- TMPL_VAR NAME="barcode" --></h2>
-	<form action=/cgi-bin/koha/moditem.pl method=post>
-	<input type=hidden name=bibitem value=<!-- TMPL_VAR NAME="biblioitemnumber" -->>
-	<input type=hidden name=item value=<!-- TMPL_VAR NAME="itemnumber" -->>
-	<input type=hidden name=type value=<!-- TMPL_VAR NAME="type" -->>
-	<INPUT TYPE="image" name="submit"  VALUE="modify" BORDER=0 src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png">
-	<INPUT TYPE="image" name="delete"  VALUE="delete" BORDER=0 src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png">
+	<form action="/cgi-bin/koha/moditem.pl" method="post">
+	<input type="hidden" name="bibitem" value=<!-- TMPL_VAR NAME="biblioitemnumber" -->>
+	<input type="hidden" name="item" value=<!-- TMPL_VAR NAME="itemnumber" -->>
+	<input type="hidden" name="type" value=<!-- TMPL_VAR NAME="type" -->>
+	<input type="image" name="submit"  VALUE="modify" border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
+	<input type="image" name="delete"  VALUE="delete" border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png">
 	<br>
 	<b>Home Branch:</b> <!-- TMPL_VAR NAME="homebranch" --><br>
 	<b>Last seen:</b> <!-- TMPL_VAR NAME="datelastseen" --><br>
@@ -59,12 +59,12 @@
 	<b>Paid for:</b> <!-- TMPL_VAR NAME="paidfor" --><br>
 	<b>Notes:</b> <!-- TMPL_VAR NAME="itemnotes" --><br>
 	<b>Renewals:</b> <!-- TMPL_VAR NAME="renewals" --><br>
-	<b><a href="/cgi-bin/koha/acqui/acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&biblio=<!-- TMPL_VAR NAME="biblionumber" -->&invoice=<!-- TMPL_VAR NAME="booksellerinvoicenumber" -->&catview=yes">
+	<b><a href="/cgi-bin/koha/acqui/acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->&amp;invoice=<!-- TMPL_VAR NAME="booksellerinvoicenumber" -->&catview=yes">
 	Accession</a>
 	Date:<!-- TMPL_VAR NAME="dateaccessioned" --><br>
 	<b>Cancelled: <!-- TMPL_VAR NAME="wthdrawn" --><br>
 	<b><a
-	href=/cgi-bin/koha/bookcount.pl?&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&itm=<!-- TMPL_VAR NAME="itemnumber" -->>Total
+	href="/cgi-bin/koha/bookcount.pl?&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;itm=<!-- TMPL_VAR NAME="itemnumber" -->">Total
 	Issues:</a></b> <!-- TMPL_VAR NAME="issues" --><br>
 	<b>Group Number:</b> <!-- TMPL_VAR NAME="biblioitemnumber" --> <br>
 	<b>Biblio number:</b> <!-- TMPL_VAR NAME="biblionumber" --> <br>
diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl
index 9cf5a562a6..56e0637c7b 100644
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl
@@ -6,51 +6,51 @@
 <center>
 
 
-<!-- TMPL_IF NAME=searchdesc -->
-	You searched on <b><!-- TMPL_VAR NAME=searchdesc --></b>
+<!-- TMPL_IF NAME="searchdesc" -->
+	You searched on <b><!-- TMPL_VAR NAME="searchdesc" --></b>
 <!-- TMPL_ELSE -->
 	You did not specify any seach criteria<br>
 <!-- /TMPL_IF -->
 
-<!-- TMPL_VAR NAME=numrecords --> results found
+<!-- TMPL_VAR NAME="numrecords" --> results found
 <p>
 <!-- Row of numbers corresponding to search result pages -->
-<!-- TMPL_IF NAME=displayprev -->
-	<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->&<!-- TMPL_LOOP NAME=FORMINPUTS --><!-- TMPL_VAR NAME=term -->=<!-- TMPL_VAR name="value" ESCAPE=URL -->&<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->><img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/prev.gif border=0></a>
+<!-- TMPL_IF NAME="displayprev" -->
+	<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->&amp;<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif" border="0"></a>
 <!-- TMPL_ELSE -->
-	<img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/placeholder.gif border=0>
+	<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border="0">
 <!-- /TMPL_IF -->
-<!-- TMPL_LOOP NAME=numbers -->
-	<!-- TMPL_IF NAME=highlight -->
-	<img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif>
+<!-- TMPL_LOOP NAME="numbers" -->
+	<!-- TMPL_IF NAME="highlight" -->
+	<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
 	<!-- TMPL_ELSE -->
-	<a href=search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=FORMINPUTS --><!-- TMPL_VAR NAME=term -->=<!-- TMPL_VAR name="value" ESCAPE=URL -->&<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME=opac -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->><img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/<!-- TMPL_VAR NAME=number -->.gif border=0></a>
+	<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
 	<!-- /TMPL_IF -->
 <!-- /TMPL_LOOP -->
-<!-- TMPL_IF NAME=displaynext -->
-	<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->&<!-- TMPL_LOOP NAME=FORMINPUTS --><!-- TMPL_VAR NAME=term -->=<!-- TMPL_VAR name="value" ESCAPE=URL -->&<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->><img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/next.gif border=0></a>
+<!-- TMPL_IF NAME="displaynext" -->
+	<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->&amp;<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border="0"></a>
 <!-- TMPL_ELSE -->
-	<img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/placeholder.gif border=0>
+	<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border="0">
 <!-- /TMPL_IF -->
 
 <p>
 <!-- Search Results Table -->
-<!-- TMPL_IF NAME=numrecords -->
-<table border=0 cellspacing=0 cellpadding=2 width=90%>
-<tr <!-- TMPL_IF NAME="opac" -->bgcolor=#99cccc background=<!-- TMPL_VAR name="themelang" -->/images/background-opac.gif<!-- TMPL_ELSE --> background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"<!-- /TMPL_IF -->>
-	<th align=left>Title</th><th align=left>Author</th><th>&copy;</th><th>Item Count</th><th>Location</th>
+<!-- TMPL_IF NAME="numrecords" -->
+<table border="0" cellspacing="0" cellpadding="2" width="90%">
+<tr <!-- TMPL_IF NAME="opac" -->bgcolor="#99cccc" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif<!-- TMPL_ELSE --> background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"<!-- /TMPL_IF -->">
+	<th align="left">Title</th><th align="left">Author</th><th>&copy;</th><th>Item Count</th><th>Location</th>
 	<!-- TMPL_IF NAME="opac" -->
 	<!-- TMPL_ELSE -->
 	<th>&nbsp;</th>
 	<!-- /TMPL_IF -->
 </tr>
 <!-- Actual Search Results -->
-<!-- TMPL_LOOP NAME=SEARCH_RESULTS -->
+<!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
 	<tr>
-		<td><a href=/cgi-bin/koha/<!-- TMPL_VAR name="script" -->?type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->&bib=<!-- TMPL_VAR NAME=biblionumber ESCAPE=URL -->><!-- TMPL_VAR NAME=title --></a></td>
-		<td><a href=/cgi-bin/koha/search.pl?author=<!-- TMPL_VAR NAME=authorhtmlescaped -->&type=<!-- TMPL_IF NAME=opac -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->><!-- TMPL_VAR NAME=author --></a></td>
-		<td align=center> <!-- TMPL_VAR NAME=copyrightdate --> </td>
-		<td align=center> <!-- TMPL_VAR NAME=itemcount --> </td>
+		<td><a href="/cgi-bin/koha/<!-- TMPL_VAR NAME="script" -->?type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->><!-- TMPL_VAR NAME="title" --></a></td>
+		<td><a href="/cgi-bin/koha/search.pl?author=<!-- TMPL_VAR NAME="authorhtmlescaped" -->&amp;type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->"><!-- TMPL_VAR NAME="author" --></a></td>
+		<td align="center"> <!-- TMPL_VAR NAME="copyrightdate" --> </td>
+		<td align="center"> <!-- TMPL_VAR NAME="itemcount" --> </td>
 		<td>
 		<!-- TMPL_IF NAME=use-location-flags-p -->
 		<!-- TMPL_IF NAME=location-only --><!-- TMPL_VAR NAME=location-only --><br><!-- /TMPL_IF -->
@@ -59,13 +59,13 @@
 		<!-- TMPL_IF NAME=withdrawn-p -->Withdrawn<!-- TMPL_IF NAME=withdrawn-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME=on-loan-p -->On Loan<!-- TMPL_IF NAME=on-loan-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
 		<!-- TMPL_ELSE -->
-		<!-- TMPL_VAR NAME=location -->
+		<!-- TMPL_VAR NAME="location" -->
 		<!-- /TMPL_IF -->
 		</td>
 		<!-- TMPL_IF NAME="opac" -->
 		<!-- TMPL_ELSE -->
-			<!-- TMPL_UNLESS NAME="norequests" -->
-				<td> <a href=/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->>Request</a></td>
+			<!-- TMPL_UNLESS name="norequests" -->
+				<td> <a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Request</a></td>
 			<!-- TMPL_ELSE -->
 				<td>Not Reservable</td>
 			<!-- /TMPL_UNLESS -->
@@ -73,20 +73,20 @@
 	</tr>
 <!-- /TMPL_LOOP -->
 
-<tr <!-- TMPL_IF NAME="opac" -->bgcolor=#99cccc background=<!-- TMPL_VAR name="themelang" -->/images/background-opac.gif<!-- TMPL_ELSE -->bgcolor=#ccccff background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"<!-- /TMPL_IF -->>
-	<td colspan=6>
-		<table border=0 cellpadding=0 cellspacing=0 width="100%">
-			<tr <!-- TMPL_IF NAME="opac" -->bgcolor=#99cccc background=<!-- TMPL_VAR name="themelang" -->/images/background-opac.gif<!-- TMPL_ELSE -->bgcolor=#ccccff background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"<!-- /TMPL_IF -->>
-			<td align=left>
-				<!-- TMPL_IF NAME=displayprev -->
-				<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->&<!-- TMPL_LOOP NAME=FORMINPUTS --><!-- TMPL_VAR NAME=term -->=<!-- TMPL_VAR name="value" ESCAPE=URL -->&<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->>Previous Records</a>
+<tr <!-- TMPL_IF NAME="opac" -->bgcolor="#99CCCC" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif<!-- TMPL_ELSE -->bgcolor="#CCCCFF" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"<!-- /TMPL_IF -->>
+	<td colspan="6">
+		<table border="0" cellpadding="0" cellspacing="0" width="100%">
+			<tr <!-- TMPL_IF NAME="opac" -->bgcolor="#99CCCC" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif<!-- TMPL_ELSE -->bgcolor="#CCCCFF" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"<!-- /TMPL_IF -->>
+			<td align="left">
+				<!-- TMPL_IF NAME="displayprev" -->
+				<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->&amp;<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->">Previous Records</a>
 				<!-- TMPL_ELSE -->
 				&nbsp;
 				<!-- /TMPL_IF -->
 			</td>
-			<td align=right>
-				<!-- TMPL_IF NAME=displaynext -->
-				<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->&<!-- TMPL_LOOP NAME=FORMINPUTS --><!-- TMPL_VAR NAME=term -->=<!-- TMPL_VAR name="value" ESCAPE=URL -->&<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->>Next Records</a>
+			<td align="right">
+				<!-- TMPL_IF NAME="displaynext" -->
+				<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->&amp;<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->">Next Records</a>
 				<!-- TMPL_ELSE -->
 				&nbsp;
 				<!-- /TMPL_IF -->
@@ -101,10 +101,10 @@
 Results <b><!-- TMPL_VAR NAME="startfrom" --></b> through <b><!-- TMPL_VAR NAME="endat" --></b> of <b><!-- TMPL_VAR NAME="numrecords" --></b> records.
 <hr>
 
-Try another <a href=/cgi-bin/koha/catalogue-home.pl>search</a>
+Try another <a href="/cgi-bin/koha/catalogue-home.pl">search</a>
 
 <!-- TMPL_ELSE -->
-    Try another <a href=/cgi-bin/koha/catalogue-home.pl>search</a>
+    Try another <a href="/cgi-bin/koha/catalogue-home.pl">search</a>
 <!-- /TMPL_IF -->
 
 
diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/subject.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/subject.tmpl
index 31581cc2b2..f903334de9 100644
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/subject.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/subject.tmpl
@@ -4,9 +4,7 @@
 	<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 <!-- /TMPL_IF -->
 
-<center>
-
-<table border=0 cellspacing=0 cellpadding=2>
+<table border="0" cellspacing="0" cellpadding="2" align="center">
 <!-- TMPL_IF NAME="opac" -->
 	<tr bgcolor="#99cccc" background="/images/background-opac.gif">
 <!-- TMPL_ELSE -->
@@ -14,10 +12,10 @@
 <!-- /TMPL_IF -->
 		<th>Subject</th>
 	</tr>
-<!-- TMPL_LOOP NAME=SEARCH_RESULTS -->
+<!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
 	<tr>
 		<td>
-			<a href="/cgi-bin/koha/search.pl?type=<!-- TMPL_IF NAME=opac -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->&subjectitems=<!-- TMPL_VAR NAME=subject2 ESCAPE=HTML -->"><!-- TMPL_VAR NAME=subject --></a>
+			<a href="/cgi-bin/koha/search.pl?type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->&amp;subjectitems=<!-- TMPL_VAR NAME=subject2 ESCAPE=HTML -->"><!-- TMPL_VAR NAME="subject" --></a>
 		</td>
 	</tr>
 <!-- /TMPL_LOOP -->
@@ -26,14 +24,14 @@
 <!-- TMPL_ELSE -->
 	<tr background="/images/background-mem.gif">
 <!-- /TMPL_IF -->
-		<td colspan=4>
-			<table border=0 cellpadding=0 cellspacing=0 width=100%>
+		<td colspan="4">
+			<table border="0" cellpadding="0" cellspacing="0" width="100%">
 			<tr>
-				<td align=left>
-					<a href="search.pl?<!-- TMPL_LOOP name=FORMINPUTS --><!-- TMPL_VAR NAME=line -->&<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->">Previous Records</a>
+				<td align="left">
+					<a href="search.pl?<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="line" -->&amp;<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->">Previous Records</a>
 				</td>
-				<td align=right>
-					<a href="search.pl?<!-- TMPL_LOOP name=FORMINPUTS --><!-- TMPL_VAR NAME=line -->&<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->">Next Records</a>
+				<td align="right">
+					<a href="search.pl?<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="line" -->&amp;<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->">Next Records</a>
 				</td>
 			</tr>
 			</table>