diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/subtypes_unimarc.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/subtypes_unimarc.inc
index 397c39a7b7..f7cc9d1202 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/subtypes_unimarc.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/subtypes_unimarc.inc
@@ -1,62 +1,61 @@
-</div>
-<div id="sidebar">
+<div id="yui-b">
 <!-- SUBTYPE LIMITS -->
 		<fieldset>
-		<legend>Champs Cod&eacute;s</legend>
+		<legend>Coded Fields</legend>
 		<p>
-		<label>Public</label>
+		<label>Audience</label>
 		<select name="limit" class="subtype">
-            <option value="" SELECTED="selected" class="menuheader">Tout public</option>
-			<option value="aud:a">Jeunesse en g&eacute;n&eacute;ral</option>
-			<option value="aud:b">Pr&eacute;-scolaire</option>
-			<option value="aud:c">scolaire</option>
-			<option value="aud:d">enfant</option>
-			<option value="aud:e">jeune adulte</option>
-			<option value="aud:k">adulte, haut niveau</option>
-			<option value="aud:m">fiction ou vulg adulte</option>
-			<option value="aud:u">inconnu</option>
+            <option value="" SELECTED="selected" >Any</option>
+			<option value="aud:a">juvenile, general</option>
+			<option value="aud:b">pre-primary (0-5)</option>
+			<option value="aud:c">Primary (5-8)</option>
+			<option value="aud:d">children (9-14)</option>
+			<option value="aud:e">Young Adult</option>
+			<option value="aud:k">Adult, serious</option>
+			<option value="aud:m">Adult, General</option>
+			<option value="aud:u">Unknown</option>
 		</select>
 		</p>
 		<p>
-		<label>Format</label>
+		<label>Print</label>
         <select name="limit" class="subtype">
-			<option value="" selected="selected" class="menuheader">Tout format</option>
-				<option value="Material-type:r">Impression normale</option>
-				<option value="Material-type:d">Impression en gros caractere</option>
-				<option value="Material-type:e">Journal</option>
-				<option value="Material-type:f">Caractere braille et moon</option>
-				<option value="Material-type:g">Micro-impression</option>
-				<option value="Material-type:h">Manuscrit</option>
-				<option value="Material-type:i">Multimedia</option>
-				<option value="Material-type:j">Impression en reduction</option>
-				<option value="Material-type:z">Autres formes de presentation</option>
+			<option value="" selected="selected" >any</option>
+				<option value="Material-type:r">regular print</option>
+				<option value="Material-type:d">large print</option>
+				<option value="Material-type:e">newspaper format</option>
+				<option value="Material-type:f">Braille or Moon script</option>
+				<option value="Material-type:g">microprint</option>
+				<option value="Material-type:h">hand-written</option>
+				<option value="Material-type:i">multimedia</option>
+				<option value="Material-type:j">mini-print</option>
+				<option value="Material-type:z">other form of textual material</option>
 		</select>
 		</p>
 		<p>
-		<label>Forme</label>
+		<label>Feschrift Ind.</label>
 		<select name="limit" class="subtype">
-			<option value="" selected="selected" class="menuheader">Toute forme</option>
-            <option value="Literature-Code:a">fiction, roman</option>
-            <option value="Literature-Code:b">Theatre, piece televisee</option>
-            <option value="Literature-Code:c">Essais</option>
-            <option value="Literature-Code:d">Humour, satire</option>
-            <option value="Literature-Code:e">Lettres</option>
-            <option value="Literature-Code:f">Nouvelles</option>
-            <option value="Literature-Code:g">Poesie</option>
-            <option value="Literature-Code:h">Discours, art oratoire</option>
-            <option value="Literature-Code:y">Il ne s'agit pas d'un texte litteraire</option>
-            <option value="Literature-Code:z">formes vari&eacute;es ou autres formes litteraires</option>
+			<option value="" selected="selected" >Any</option>
+            <option value="Literature-Code:a">fiction</option>
+            <option value="Literature-Code:b">drama</option>
+            <option value="Literature-Code:c">essays</option>
+            <option value="Literature-Code:d">humour, satire</option>
+            <option value="Literature-Code:e">letters</option>
+            <option value="Literature-Code:f">short stories</option>
+            <option value="Literature-Code:g">poetry</option>
+            <option value="Literature-Code:h">speeches, oratory</option>
+            <option value="Literature-Code:y">not a literary text</option>
+            <option value="Literature-Code:z">multiple/other lit. forms</option>
 		</select>
 		</p>
         <p>
-		<label>Biographie</label>
+		<label>Biography</label>
         <select name="limit" class="subtype" size="1">
-            <option value="">Tout type de biographie</option>
-            <option value="Biography:y">C'est pas une biographie</option>
-            <option value="Biography-code:a">autobiographie (y compris correspondance...)</option>
-            <option value="Biography:b">Biographie individuelle</option>
-            <option value="Biography:c">Biographie collective</option>
-            <option value="Biography:d">Contient des informations biographiques</option>
+            <option value="">Any</option>
+            <option value="Biography-code:y">Not a biography</option>
+            <option value="Biography-code:a">autobiography</option>
+            <option value="Biography-code:b">individual biography</option>
+            <option value="Biography-code:c">collective biography</option>
+            <option value="Biography-code:d">contains biogr. data</option>
 		</select>
         </p>
         <p>
@@ -82,30 +81,30 @@
         </select>
         </p>
 		<p>
-		<label>Contenu</label>
+		<label>Content</label>
 		<select name="limit" class="subtype">
-			<option value="" >Tout type de contenu</option>
-            <option value="ctype:a" >Bibliographie</option>
-            <option value="ctype:b" >Catalogue</option>
+			<option value="" >Any</option>
+            <option value="ctype:a" >bibliography</option>
+            <option value="ctype:b" >catalogue</option>
             <option value="ctype:c" >index</option>
-            <option value="ctype:d" >resume</option>
-            <option value="ctype:e" >Dictionnaire</option>
-            <option value="ctype:f" >encyclopedie</option>
-            <option value="ctype:g" >Repertoire</option>
-            <option value="ctype:h" >Description projet</option>
-            <option value="ctype:i" >statistiques</option>
-            <option value="ctype:j" >Manuels d'enseignement programme</option>
-            <option value="ctype:k" >Brevet</option>
-            <option value="ctype:l" >norme</option>
-            <option value="ctype:m" >Memoire ou these</option>
-            <option value="ctype:n" >Lois et decrets</option>
-            <option value="ctype:o" >Table numerique</option>
-            <option value="ctype:p" >Rapport technique</option>
-            <option value="ctype:q" >Sujet d'examen</option>
-            <option value="ctype:r" >Synthese bibliographique</option>
-            <option value="ctype:s" >Traite</option>
-            <option value="ctype:t" >Bande dessinee</option>
-            <option value="ctype:z" >Autres</option>
+            <option value="ctype:d" >abstract</option>
+            <option value="ctype:e" >dictionary</option>
+            <option value="ctype:f" >encyclopaedia</option>
+            <option value="ctype:g" >directory</option>
+            <option value="ctype:h" >project description</option>
+            <option value="ctype:i" >statistics</option>
+            <option value="ctype:j" >programmed text books</option>
+            <option value="ctype:k" >patent</option>
+            <option value="ctype:l" >standard</option>
+            <option value="ctype:m" >dissertation or thesis</option>
+            <option value="ctype:n" >laws and legislation</option>
+            <option value="ctype:o" >numeric table</option>
+            <option value="ctype:p" >technical report</option>
+            <option value="ctype:q" >examination paper</option>
+            <option value="ctype:r" >literature surveys/reviews</option>
+            <option value="ctype:s" >treaties</option>
+            <option value="ctype:t" >cartoons or comic strips</option>
+            <option value="ctype:z" >other</option>
 		</select>
         </p>
         <p>
@@ -204,3 +203,4 @@
         </p>
 
 </fieldset>
+</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
index 598b4fcc99..27b6ff3b1d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
@@ -91,8 +91,8 @@ function Changefwk(FwkList) {
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></span>
                     <!-- TMPL_VAR NAME="marc_value" -->
                     <!-- TMPL_IF name="link" -->
-                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;type=intranet&amp;q=an=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/img/filefind.png" height="15" title="Search biblios having this authority" alt="Search biblios having this authority" />
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->" alt="Search on <!-- TMPL_VAR name="marc_value" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
@@ -121,8 +121,8 @@ function Changefwk(FwkList) {
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></span>
                     <!-- TMPL_VAR NAME="marc_value" -->
                     <!-- TMPL_IF name="link" -->
-                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;type=intranet&amp;q=an=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/img/filefind.png" height="15" title="Search biblios having this authority" alt="Search biblios having this authority" />
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->" alt="Search on <!-- TMPL_VAR name="marc_value" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
@@ -151,8 +151,8 @@ function Changefwk(FwkList) {
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></span>
                     <!-- TMPL_VAR NAME="marc_value" -->
                     <!-- TMPL_IF name="link" -->
-                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;type=intranet&amp;q=an=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/img/filefind.png" height="15" title="Search biblios having this authority" alt="Search biblios having this authority" />
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->" alt="Search on <!-- TMPL_VAR name="marc_value" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
@@ -181,8 +181,8 @@ function Changefwk(FwkList) {
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></span>
                     <!-- TMPL_VAR NAME="marc_value" -->
                     <!-- TMPL_IF name="link" -->
-                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;type=intranet&amp;q=an=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/img/filefind.png" height="15" title="Search biblios having this authority" alt="Search biblios having this authority" />
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->" alt="Search on <!-- TMPL_VAR name="marc_value" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
@@ -211,8 +211,8 @@ function Changefwk(FwkList) {
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></span>
                     <!-- TMPL_VAR NAME="marc_value" -->
                     <!-- TMPL_IF name="link" -->
-                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;type=intranet&amp;q=an=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/img/filefind.png" height="15" title="Search biblios having this authority"> alt="Search biblios having this authority" />
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->"> alt="Search on <!-- TMPL_VAR name="marc_value" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
@@ -241,8 +241,8 @@ function Changefwk(FwkList) {
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></span>
                     <!-- TMPL_VAR NAME="marc_value" -->
                     <!-- TMPL_IF name="link" -->
-                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;type=intranet&amp;q=an=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/img/filefind.png" height="15" title="Search biblios having this authority" alt="Search biblios having this authority" />
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->" alt="Search on <!-- TMPL_VAR name="marc_value" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
@@ -271,8 +271,8 @@ function Changefwk(FwkList) {
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></span>
                     <!-- TMPL_VAR NAME="marc_value" -->
                     <!-- TMPL_IF name="link" -->
-                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;type=intranet&amp;q=an=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/img/filefind.png" height="15" title="Search biblios having this authority" alt="Search biblios having this authority" />
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->" alt="Search on <!-- TMPL_VAR name="marc_value" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
@@ -301,8 +301,8 @@ function Changefwk(FwkList) {
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></span>
                     <!-- TMPL_VAR NAME="marc_value" -->
                     <!-- TMPL_IF name="link" -->
-                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;type=intranet&amp;q=an=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/img/filefind.png" height="15" title="Search biblios having this authority" alt="Search biblios having this authority" />
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->" alt="Search on <!-- TMPL_VAR name="marc_value" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
@@ -331,8 +331,8 @@ function Changefwk(FwkList) {
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></span>
                     <!-- TMPL_VAR NAME="marc_value" -->
                     <!-- TMPL_IF name="link" -->
-                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;type=intranet&amp;q=an=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/img/filefind.png" height="15" title="Search biblios having this authority" alt="Search biblios having this authority" />
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->" alt="Search on <!-- TMPL_VAR name="marc_value" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
@@ -361,8 +361,8 @@ function Changefwk(FwkList) {
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></span>
                     <!-- TMPL_VAR NAME="marc_value" -->
                     <!-- TMPL_IF name="link" -->
-                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;type=intranet&amp;q=an=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/img/filefind.png" height="15" title="Search biblios having this authority" alt="Search biblios having this authority" />
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->" alt="Search on <!-- TMPL_VAR name="marc_value" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
@@ -398,4 +398,4 @@ function Changefwk(FwkList) {
 <!-- TMPL_INCLUDE NAME="biblio-view-menu.inc" -->
 </div>
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
index aa3e210e85..e17a1ad0cc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
@@ -165,8 +165,43 @@
 <!-- /TMPL_IF -->
 <!-- /TYPE LIMITS -->
 
+<!-- AVAILABILITY LIMITS -->
+    <fieldset><legend>Location and availability: </legend>
+        <p>
+        <label for="available-items">Only items currently available</label><input type="checkbox" id="available-items" name="limit" value="available" /></p>
+        <p>
+        <label>Individual Libraries </label><select name="limit" id="branchloop" onchange='if(this.value != ""){document.getElementById("categoryloop").disabled=true;} else {document.getElementById("categoryloop").disabled=false;}'>
+        <option value="">All Libraries</option>
+        <!-- TMPL_LOOP NAME="branchloop" -->
+        <option value="homebranch:<!-- TMPL_VAR NAME='value' -->"><!-- TMPL_VAR NAME='branchname' --></option>
+        <!-- /TMPL_LOOP -->
+        </select>
+    <!-- <input type='hidden' name='limit' value='branch: MAIN' /> -->
+        </p>
+        <!-- TMPL_IF NAME="searchdomainloop" -->
+    <p>OR<p> <!-- should addjs to grey out group pulldown if a library is selected. -->
+    <p>
+        <label>Groups of Libraries</label><select name="multibranchlimit" id="categoryloop">
+        <option value=""> -- none -- </option>
+        <!-- TMPL_LOOP NAME="searchdomainloop" -->
+        <option value="<!-- TMPL_VAR NAME='categorycode' -->"><!-- TMPL_VAR NAME='categoryname' --></option>
+        <!-- /TMPL_LOOP -->
+        </select>
+        </p>
+    <!-- /TMPL_IF -->
+    </fieldset>
+<!-- /AVAILABILITY LIMITS -->
+
+<!-- RANK LIMITS -->
+
+<fieldset><legend>Sort by: </legend>
+    <p><select id="sort_by" name="sort_by">
+  <!-- TMPL_INCLUDE NAME="resort_form.inc" -->
+    </select>
+        </p>
+</fieldset>
+<!-- RANK LIMITS -->
 
-</div>
 </div>
 <!-- TMPL_IF NAME="UNIMARC" -->
 <!-- TMPL_INCLUDE NAME="subtypes_unimarc.inc" -->
@@ -238,42 +273,6 @@
 </fieldset>
 <!-- /TMPL_IF -->
 
-<!-- AVAILABILITY LIMITS -->
-    <fieldset><legend>Location and availability: </legend>
-        <p>
-        <label for="available-items">Only items currently available</label><input type="checkbox" id="available-items" name="limit" value="available" /></p>
-        <p>
-        <label>Individual Libraries </label><select name="limit" id="branchloop" onchange='if(this.value != ""){document.getElementById("categoryloop").disabled=true;} else {document.getElementById("categoryloop").disabled=false;}'>
-        <option value="">All Libraries</option>
-        <!-- TMPL_LOOP NAME="branchloop" -->
-        <option value="branch:<!-- TMPL_VAR NAME='value' -->"><!-- TMPL_VAR NAME='branchname' --></option>
-        <!-- /TMPL_LOOP -->
-        </select>
-		<!-- <input type='hidden' name='limit' value='branch: MAIN' /> -->
-        </p>
-        <!-- TMPL_IF NAME="searchdomainloop" -->
-		<p>OR<p> <!-- should addjs to grey out group pulldown if a library is selected. -->
-		<p>
-        <label>Groups of Libraries</label><select name="multibranchlimit" id="categoryloop">
-        <option value=""> -- none -- </option>
-        <!-- TMPL_LOOP NAME="searchdomainloop" -->
-        <option value="<!-- TMPL_VAR NAME='categorycode' -->"><!-- TMPL_VAR NAME='categoryname' --></option>
-        <!-- /TMPL_LOOP -->
-        </select>
-        </p>
-		<!-- /TMPL_IF -->
-    </fieldset>
-<!-- /AVAILABILITY LIMITS -->
-
-<!-- RANK LIMITS -->
-
-<fieldset><legend>Sort by: </legend>
-    <p><select id="sort_by" name="sort_by">
-	<!-- TMPL_INCLUDE NAME="resort_form.inc" -->
-    </select>
-        </p>
-</fieldset>
-<!-- RANK LIMITS -->
 <!-- SEARCH BUTTONS -->
             <p><input class="submit" type="submit" accesskey="s" value="Search" />
             <!-- TMPL_IF NAME="expanded_options" -->
@@ -286,7 +285,5 @@
 <!-- /SEARCH BUTTONS -->
 </form>
 </div>
-</div>
-</div>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->