diff --git a/koha-tmpl/opac-tmpl/npl/en/opac-authoritiesdetail.tmpl b/koha-tmpl/opac-tmpl/npl/en/opac-authoritiesdetail.tmpl
index 61eb797b61..077be1eb1e 100644
--- a/koha-tmpl/opac-tmpl/npl/en/opac-authoritiesdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/npl/en/opac-authoritiesdetail.tmpl
@@ -6,13 +6,7 @@
 <div id="main">
 <div class="tabbed">
 	<h1>Authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
-	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">Edit</a>
-	<!-- TMPL_UNLESS name="count" -->
-		<a href="javascript:confirm_deletion()">Delete</a>
-	<!-- /TMPL_UNLESS -->
-	<a href="javascript:Dopop('detailprint.pl?authid=<!-- TMPL_VAR NAME="authid" -->')">Print</a>
-	<a href="../search.marc/search.pl?type=opac&amp;op=do_search&amp;marclist=<!-- TMPL_VAR NAME="biblio_fields" -->&amp;operator==&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;and_or=and&amp;excluding="><!-- TMPL_VAR name="count" --> biblios</a>
-</div>
+	</div>
 
 <div name="0XX" id="0XX" class="tab" style="visibility:visible">
 	<!-- TMPL_LOOP NAME="0XX" -->
diff --git a/koha-tmpl/opac-tmpl/npl/en/opac-authoritiessearchresultlist.tmpl b/koha-tmpl/opac-tmpl/npl/en/opac-authoritiessearchresultlist.tmpl
index e0fa75b8c0..6e405ec555 100644
--- a/koha-tmpl/opac-tmpl/npl/en/opac-authoritiessearchresultlist.tmpl
+++ b/koha-tmpl/opac-tmpl/npl/en/opac-authoritiessearchresultlist.tmpl
@@ -7,7 +7,7 @@
 	<h1>Authority search results</h1>
 	<div id="pages">
 			<!-- TMPL_IF name="displayprev" -->
-				<a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=opac&amp;op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
+				<a href="opac-authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=opac&amp;op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
 					&lt;&lt;
 				</a>
 			<!-- /TMPL_IF -->
@@ -15,11 +15,11 @@
 				<!-- TMPL_IF name="highlight" -->
 					<span class="current"><!-- TMPL_VAR NAME="number" --></span>
 				<!-- TMPL_ELSE -->
-					<a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=opac&amp;op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->"><!-- TMPL_VAR NAME="number" --></a>
+					<a href="opac-authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=opac&amp;op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->"><!-- TMPL_VAR NAME="number" --></a>
 				<!-- /TMPL_IF -->
 			<!-- /TMPL_LOOP -->
 			<!-- TMPL_IF name="displaynext" -->
-				<a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=opac&amp;op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->">&gt;&gt;</a>
+				<a href="opac-authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=opac&amp;op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->">&gt;&gt;</a>
 				<!-- /TMPL_IF -->
 		</div>
 		<div id="results">
@@ -33,26 +33,24 @@
 <div class="searchresults">
 		<table>
 			<tr>
+				<th width="70%">Authorized Headings</th>
+				<th width="10%">Type of Heading</th>
 				<!-- TMPL_UNLESS name="isEDITORS" -->
 					<th width="10%"># of Bib Records</th>
 				<!-- /TMPL_UNLESS -->
-				<th width="70%">Authorized Headings</th>
-				<th width="10%">Type of Heading</th>
 				<th width="10%">Full Authorized Heading</th>				
 			</tr>
 			<!-- TMPL_LOOP NAME="result" -->
 				<tr>
-
+					<td><!-- TMPL_VAR NAME="summary" --></td>
+						<td>
+					<!-- TMPL_VAR NAME="authtype" -->
+						</td>
 					<!-- TMPL_UNLESS name="isEDITORS" -->
 						<td>
 							<!-- <a href="/cgi-bin/koha/opac-search.pl?type=opac&amp;op=do_search&amp;marclist=<!-- TMPL_VAR NAME="biblio_fields" -->&amp;operator==&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;and_or=and&amp;excluding="><!-- TMPL_VAR NAME="used" --></a> --> <!-- TMPL_VAR NAME="used" -->
 						</td>
 					<!-- /TMPL_UNLESS -->
-					<td><!-- TMPL_VAR NAME="summary" --></td>
-
-						<td>
-					<!-- TMPL_VAR NAME="authtype" -->
-						</td>
 						<td>
 						                                                <a href="opac-authoritiesdetail.pl?authid=<!-- TMPL_VAR NAME="authid" -->">View Full Heading</a>             
 												                                        </td>
@@ -64,15 +62,15 @@
 	<div id="resultnumber">
 		<p>
 			<!-- TMPL_IF name="displayprev" -->
-				<a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=opac&amp;op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->">&lt;&lt;</a>
+				<a href="opac-authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=opac&amp;op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->">&lt;&lt;</a>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_LOOP NAME="numbers" -->
 				<!-- TMPL_IF name="highlight" --><span class="current"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE -->
-					<a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=opac&amp;op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->"><!-- TMPL_VAR NAME="number" --></a>
+					<a href="opac-authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=opac&amp;op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->"><!-- TMPL_VAR NAME="number" --></a>
 				<!-- /TMPL_IF -->
 			<!-- /TMPL_LOOP -->
 			<!-- TMPL_IF name="displaynext" -->
-				<a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=opac&amp;op=do_search&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->">&gt;&gt;</a>
+				<a href="opac-authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=opac&amp;op=do_search&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->">&gt;&gt;</a>
 				<!-- /TMPL_IF -->
 		</p>
 	</div>	
diff --git a/koha-tmpl/opac-tmpl/npl/en/opac-dictionary.tmpl b/koha-tmpl/opac-tmpl/npl/en/opac-dictionary.tmpl
index 08a47f83cc..64cd429496 100644
--- a/koha-tmpl/opac-tmpl/npl/en/opac-dictionary.tmpl
+++ b/koha-tmpl/opac-tmpl/npl/en/opac-dictionary.tmpl
@@ -54,7 +54,7 @@
 						</td>
 							<td>
 							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="summary" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)" class="button catalogue">Select</a> | 
-							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)" class="button catalogue">Sel &amp; close</a>
+							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="summary" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)" class="button catalogue">Sel &amp; close</a>
 						</td>
 					</tr>
 				<!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl b/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl
index 7844610f85..f8604e52e2 100644
--- a/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl
+++ b/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl
@@ -52,7 +52,13 @@
 			<input type="hidden" name="operator" value="=" />
 			<input type="hidden" name="op" value="do_search" />
 			<input type="hidden" name="type" value="opac" />
-			<!-- TMPL_VAR name="CGIitemtype" --> 
+			<select name="value">
+					<option value="">Any item type</option>
+						<!-- TMPL_LOOP name="itemtypeloop" -->
+								<option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="description" -->
+								</option>
+						<!-- /TMPL_LOOP -->
+				</select> 
 			Acquired by
 			<input type="hidden" name="marclist" value="items.homebranch" />
 			<input type="hidden" name="and_or" value="and" />