diff --git a/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities.tmpl
index 776f4693fc..9def8f13a5 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities.tmpl
@@ -53,7 +53,12 @@
 	<!-- TMPL_LOOP NAME="subfield_loop" -->
 		<p>
 			<label class="labelsubfield">
-				<b><!-- TMPL_VAR NAME="subfield" --></b>
+				<!-- TMPL_UNLESS name="hide_marc" -->
+					<a href="#" onclick="upSubfield('<!-- TMPL_VAR name="index" -->'); return false;">Previous</a>
+						<input type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1">
+				<!-- TMPL_ELSE -->
+						<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
+				<!-- /TMPL_UNLESS -->
 				<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
 				<!-- TMPL_VAR NAME="marc_lib" -->
 				<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
@@ -188,5 +193,21 @@ function AddField(field) {
 	document.forms[1].addfield_field.value=field;
 	document.f.submit();
 }
+
+function upSubfield(index) {
+	temp = document.forms['f'].field_value[index-1].value;
+	document.forms['f'].field_value[index-1].value=document.forms['f'].field_value[index].value;
+	document.forms['f'].field_value[index].value= temp;
+	temp = document.forms['f'].subfield[index-1].value;
+	document.forms['f'].subfield[index-1].value=document.forms['f'].subfield[index].value;
+	document.forms['f'].subfield[index].value = temp;
+	temp = document.forms['f'].mandatory[index-1].value;
+	document.forms['f'].mandatory[index-1].value=document.forms['f'].mandatory[index].value;
+	document.forms['f'].mandatory[index].value = temp;
+	temp = document.forms['f'].kohafield[index-1].value;
+	document.forms['f'].kohafield[index-1].value=document.forms['f'].kohafield[index].value;
+	document.forms['f'].kohafield[index].value = temp;
+}
+
 </script>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/npl/en/authorities/blinddetail-biblio-search.tmpl b/koha-tmpl/intranet-tmpl/npl/en/authorities/blinddetail-biblio-search.tmpl
index dabdb7e354..501c8ad5e9 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/authorities/blinddetail-biblio-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/authorities/blinddetail-biblio-search.tmpl
@@ -9,7 +9,7 @@ var index_start = <!-- TMPL_VAR NAME="index" -->;
 var whichfield = opener.opener.document.f.tag[index_start].value;
 i=index_start
 // go forward, until reaching the end of the field.
-while (i<=opener.opener.document.f.field_value.length) {
+while (i<opener.opener.document.f.field_value.length) {
 	if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '9') {
 		opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="authid">";
 	}
diff --git a/koha-tmpl/intranet-tmpl/npl/en/authorities/searchresultlist.tmpl b/koha-tmpl/intranet-tmpl/npl/en/authorities/searchresultlist.tmpl
index afc0fbc8c6..49bf598a90 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/authorities/searchresultlist.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/authorities/searchresultlist.tmpl
@@ -5,7 +5,7 @@
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
 <div id="main">
-	<h1 class="authority">Authority search results</h1>
+	<h1>Authority search results</h1>
 	<div id="resultnumber">
 		<p>
 			<!-- TMPL_IF name="displayprev" -->
@@ -39,15 +39,19 @@
 	<div id="resultlist">
 		<table>
 			<tr>
-				<th class="authority">Summary</th>
-				<th class="authority">Used in</th>
-				<th class="authority">View</th>
-				<th class="authority">Delete</th>
+				<th>Summary</th>
+				<!-- TMPL_UNLESS name="isEDITORS" --><th>Used in</th><!-- /TMPL_UNLESS -->
+				<th>View</th>
+				<th>Delete</th>
 			</tr>
 			<!-- TMPL_LOOP NAME="result" -->
 				<tr>
 					<td><!-- TMPL_VAR NAME="summary" --></td>
-					<td><a href="../search.marc/search.pl?type=intranet&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=" class="button authority"><!-- TMPL_VAR NAME="used" --> biblio(s)</a></td>
+						<!-- TMPL_UNLESS name="isEDITORS" -->
+						<td>
+							<a href="../search.marc/search.pl?type=intranet&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" --> biblio(s)</a>
+						</td>
+					<!-- /TMPL_UNLESS -->
 					<td>
 						<a href="detail.pl?authid=<!-- TMPL_VAR NAME="authid" -->">Edit</a>
 					</td>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/bull/bull-home.tmpl b/koha-tmpl/intranet-tmpl/npl/en/bull/bull-home.tmpl
index 09944dc3af..9a99ed3e65 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/bull/bull-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/bull/bull-home.tmpl
@@ -25,9 +25,13 @@
 		</tr>
 		<!-- TMPL_IF NAME="subscriptions" -->
 		<!-- TMPL_LOOP name="subscriptions" -->
-			<tr>
-				<td>
-					<!-- TMPL_VAR name="title" --> <!-- TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="toggle" -->
+					<tr class="highlight">
+				<!-- TMPL_ELSE -->
+					<tr>
+				<!-- /TMPL_IF -->
+				<td><!-- TMPL_IF name="title" --><!-- TMPL_VAR name="title" --><!-- TMPL_ELSE --> |
+					<!-- /TMPL_IF --> <!-- TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
 				</td>
 				<td>
 					<!-- TMPL_VAR name="ISSN" -->
diff --git a/koha-tmpl/intranet-tmpl/npl/en/bull/search.tmpl b/koha-tmpl/intranet-tmpl/npl/en/bull/search.tmpl
index ad985d6908..af462499a2 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/bull/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/bull/search.tmpl
@@ -18,6 +18,18 @@
 				<option value="50">50</option>
 				<option value="100">100</option>
 			</select></td></tr>
+			
+		<tr><th>
+			<label for="itemtype">Itemtype</label></th><td>
+			<!-- TMPL_VAR name="CGIitemtype" -->
+			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="category" -->" />
+			<input type="hidden" name="marclist" value="" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value="=" />
+			<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->" />
+		</td></tr>
+			
 		<tr><th><label for="orderby">Order by:</label></th><td><select name="orderby" id="orderby" size="1">
 				<option value="biblio.title">Title</option>
 				<option value="biblio.author">Author</option>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/npl/en/catalogue/MARCdetail.tmpl
index 3fcac143d3..e33b8cc31e 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/catalogue/MARCdetail.tmpl
@@ -18,10 +18,10 @@
 	<!-- TMPL_LOOP NAME="subfield" -->
 	<tr>
          <td>&nbsp;</td>
-	    <td><!-- TMPL_VAR NAME="marc_subfield" --></td>
+	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS --></td>
 		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
 		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
+		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
 	</tr>
 	<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
@@ -35,10 +35,10 @@
 	<!-- TMPL_LOOP NAME="subfield" -->
 	<tr>
          <td>&nbsp;</td>
-	    <td><!-- TMPL_VAR NAME="marc_subfield" --></td>
+	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS --></td>
 		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
 		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
+		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
        </tr>
 	<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
@@ -52,10 +52,10 @@
 	<!-- TMPL_LOOP NAME="subfield" -->
 	<tr>
          <td>&nbsp;</td>
-	    <td><!-- TMPL_VAR NAME="marc_subfield" --></td>
+	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
 		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
 		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
+		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
        </tr>
 	<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
@@ -69,10 +69,10 @@
 	<!-- TMPL_LOOP NAME="subfield" -->
 	<tr>
          <td>&nbsp;</td>
-	    <td><!-- TMPL_VAR NAME="marc_subfield" --></td>
+	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
 		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
 		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
+		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
        </tr>
 	<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
@@ -86,10 +86,10 @@
 	<!-- TMPL_LOOP NAME="subfield" -->
 	<tr>
          <td>&nbsp;</td>
-	    <td><!-- TMPL_VAR NAME="marc_subfield" --></td>
+	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
 		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
 		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
+		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
        </tr>
 	<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
@@ -103,10 +103,10 @@
 	<!-- TMPL_LOOP NAME="subfield" -->
 	<tr>
          <td>&nbsp;</td>
-	    <td><!-- TMPL_VAR NAME="marc_subfield" --></td>
+	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
 		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
 		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
+		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
        </tr>
 	<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
@@ -120,10 +120,10 @@
 	<!-- TMPL_LOOP NAME="subfield" -->
 	<tr>
          <td>&nbsp;</td>
-	    <td><!-- TMPL_VAR NAME="marc_subfield" --></td>
+	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
 		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
 		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
+		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
        </tr>
 	<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
@@ -137,10 +137,10 @@
 	<!-- TMPL_LOOP NAME="subfield" -->
 	<tr>
          <td>&nbsp;</td>
-	    <td><!-- TMPL_VAR NAME="marc_subfield" --></td>
+	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
 		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
 		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
+		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
        </tr>
 	<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
@@ -155,10 +155,10 @@
 	<!-- TMPL_LOOP NAME="subfield" -->
 	<tr>
          <td>&nbsp;</td>
-	    <td><!-- TMPL_VAR NAME="marc_subfield" --></td>
+	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
 		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
 		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
+		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
        </tr>
 	<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
@@ -172,10 +172,10 @@
 	<!-- TMPL_LOOP NAME="subfield" -->
 	<tr>
          <td>&nbsp;</td>
-	    <td><!-- TMPL_VAR NAME="marc_subfield" --></td>
+	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
 		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
 		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
+		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
        </tr>
 	<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->