diff --git a/koha-tt/opac-tmpl/prog/en/includes/masthead.inc b/koha-tt/opac-tmpl/prog/en/includes/masthead.inc
index 4192f95f22..b40519434b 100644
--- a/koha-tt/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tt/opac-tmpl/prog/en/includes/masthead.inc
@@ -84,14 +84,15 @@
          [% END %]
       </select>
    [% ELSE %]
-      [% UNLESS ( opac_limit_override ) %]
+      [% IF ( opac_limit_override ) %]
+          [% IF ( opac_search_limit ) %]
+            <input name="limit" value="[% opac_search_limit %]" type="hidden" />
+          [% END %]
+      [% ELSE %]
           [% IF ( mylibraryfirst ) %] 
                <input name="limit" value="branch:[% mylibraryfirst %]" type="hidden" />
           [% END %]
-       [% END %]
-   [% END %]
-   [% IF ( opac_search_limit ) %]
-      <input name="limit" value="[% opac_search_limit %]" type="hidden" />
+      [% END %]
    [% END %]
 
 
diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-advsearch.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-advsearch.tt
index 78fd6300ce..e98b3a43a7 100644
--- a/koha-tt/opac-tmpl/prog/en/modules/opac-advsearch.tt
+++ b/koha-tt/opac-tmpl/prog/en/modules/opac-advsearch.tt
@@ -239,11 +239,11 @@
         
         <select name="limit" id="branchloop">
         <option value="">All libraries</option>
-        [% FOREACH branchloo IN branchloop %]
-        [% IF ( branchloo.selected ) %]
-        <option value="branch:[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>
+        [% FOREACH BranchesLoo IN BranchesLoop %]
+        [% IF ( BranchesLoo.selected ) %]
+        <option value="branch:[% BranchesLoo.value %]" selected="selected">[% BranchesLoo.branchname %]</option>
         [% ELSE %]    
-        <option value="branch:[% branchloo.value %]">[% branchloo.branchname %]</option>
+        <option value="branch:[% BranchesLoo.value %]">[% BranchesLoo.branchname %]</option>
         [% END %]    
         [% END %]
         </select>