diff --git a/installer/data/mysql/atomicupdate/bug-17018.pl b/installer/data/mysql/atomicupdate/bug-17018.pl
new file mode 100755
index 0000000000..58facba735
--- /dev/null
+++ b/installer/data/mysql/atomicupdate/bug-17018.pl
@@ -0,0 +1,13 @@
+use Modern::Perl;
+
+return {
+    bug_number => "17018",
+    description => "Split AdvancedSearchTypes for staff and OPAC",
+    up => sub {
+        my ($args) = @_;
+        my $dbh = $args->{dbh};
+
+        $dbh->do( "INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) SELECT 'OpacAdvancedSearchTypes', `value`, `options`, 'Select which set of fields are available as limits on the OPAC advanced search page', `type` FROM systempreferences WHERE variable = 'AdvancedSearchTypes'" );
+
+    },
+}
diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql
index 331836cfe2..7fe1f84a2f 100644
--- a/installer/data/mysql/mandatory/sysprefs.sql
+++ b/installer/data/mysql/mandatory/sysprefs.sql
@@ -390,6 +390,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
 ('OpacAddMastheadLibraryPulldown','0','','Adds a pulldown menu to select the library to search on the opac masthead.','YesNo'),
 ('OpacAdvSearchMoreOptions','pubdate,itemtype,language,subtype,sorting,location','Show search options for the expanded view (More options)','pubdate|itemtype|language|subtype|sorting|location','multiple'),
 ('OpacAdvSearchOptions','pubdate,itemtype,language,sorting,location','Show search options','pubdate|itemtype|language|subtype|sorting|location','multiple'),
+('OpacAdvancedSearchTypes','itemtypes','itemtypes|ccode','Select which set of fields are available as limits on the OPAC advanced search page','Choice'),
 ('OPACAllowHoldDateInFuture','0','','If set, along with the AllowHoldDateInFuture system preference, OPAC users can set the date of a hold to be in the future.','YesNo'),
 ('OpacAllowPublicListCreation','1',NULL,'If set, allows opac users to create public lists','YesNo'),
 ('OpacAllowSharingPrivateLists','0',NULL,'If set, allows opac users to share private lists with other patrons','YesNo'),
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index 82ad87630f..bd11665f72 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -871,6 +871,12 @@ OPAC:
                 subtype: Subtypes
                 sorting: Sorting
                 location: Location and availability
+        -
+            - Show tabs in the OPAC advanced search for limiting searches on the
+            - pref: OpacAdvancedSearchTypes
+              class: long
+            - "fields (separate values with |). Tabs appear in the order listed.<br/>"
+            - "<em>Currently supported values</em>: Item types (<strong>itemtypes</strong>), Collection, (<strong>ccode</strong>) and Shelving Location (<strong>loc</strong>)."
     Authentication:
         -
             - pref: OPACShibOnly
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
index 701ca3b29e..ed02b37d74 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
@@ -96,11 +96,11 @@ Searching:
                    0: "Don't add"
             - search history of the unlogged user to the next patron logging in.
         -
-            - Show tabs in the OPAC and staff interface advanced search for limiting searches on the
+            - Show tabs in the staff interface advanced search for limiting searches on the
             - pref: AdvancedSearchTypes
               class: long
             - "fields (separate values with |). Tabs appear in the order listed.<br/>"
-            - "<em>Currently supported values</em>: Item types (<strong>itemtypes</strong>), Collection Codes (<strong>ccode</strong>) and Shelving Location (<strong>loc</strong>)."
+            - "<em>Currently supported values</em>: Item types (<strong>itemtypes</strong>), Collection, (<strong>ccode</strong>) and Shelving Location (<strong>loc</strong>)."
         -
             - Limit the languages listed in the advanced search drop-down to the
             - pref: AdvancedSearchLanguages
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc
index 11e0b4cf6d..2deef2e69b 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc
@@ -25,8 +25,8 @@
                             </select></li>
                 [% END %]
 
-                [% AdvancedSearchTypes = Koha.Preference('AdvancedSearchTypes').split('\|') %]
-                [% IF AdvancedSearchTypes.grep('^itemtypes$').size %]
+                [% OpacAdvancedSearchTypes = Koha.Preference('OpacAdvancedSearchTypes').split('\|') %]
+                [% IF OpacAdvancedSearchTypes.grep('^itemtypes$').size %]
                     <li>
                         <label for="itemtype">Limit to: </label>
                         <select name="itemtype" id="itemtype">
@@ -44,7 +44,7 @@
                     </li>
                 [% END %]
 
-                [% IF AdvancedSearchTypes.grep('^ccode$').size %]
+                [% IF OpacAdvancedSearchTypes.grep('^ccode$').size %]
                     <li>
                         <label for="ccode">Limit to:</label>
                         <select name="ccode" id="ccode">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt
index 68e9dc3839..6c4b668be8 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt
@@ -65,9 +65,10 @@
                 <div class="col-10 order-first order-md-first order-lg-2">
                     <div id="topissues" class="maincontent">
 
-                        <h1>Top issues</h1>
+                        <h1>Most popular</h1>
 
                         [% IF ( results ) %]
+                            [% OpacAdvancedSearchTypes = Koha.Preference('OpacAdvancedSearchTypes').split('\|') %]
                             <table id="topissuest" class="table table-bordered table-striped">
                                 <caption>
                                     The [% limit | html %] most checked-out
@@ -87,7 +88,8 @@
                                 <thead>
                                     <tr>
                                         <th class="anti-the">Title</th>
-                                        <th>[% IF ( ccodesearch ) %]Collection[% ELSE %]Item type[% END %]</th>
+                                        <th>Item type</th>
+                                        <th>Collection</th>
                                         <th>Checkouts</th>
                                         [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
                                             <th class="NoSort">&nbsp;</th>
@@ -110,13 +112,12 @@
                                                     [% IF ( result.item('size') ) %][% result.item('size') | html %][% END %]</p>
                                             </td>
                                             <td>
-                                                [% IF Koha.Preference('AdvancedSearchTypes') == 'ccode' %]
-                                                    <span class="tdlabel">Collection</span>
-                                                    [% AuthorisedValues.GetByCode('ccode', result.ccode, 1) | html %]
-                                                [% ELSE %]
-                                                    <span class="tdlabel">Item type</span>
-                                                    [% ItemTypes.GetDescription(result.itemtype) | html %]
-                                                [% END %]
+                                                <span class="tdlabel">Item type</span>
+                                                [% ItemTypes.GetDescription(result.itemtype) | html %]
+                                            </td>
+                                            <td>
+                                                <span class="tdlabel">Collection</span>
+                                                [% AuthorisedValues.GetByCode('ccode', result.ccode, 1) | html %]
                                             </td>
                                             <td data-order="[% result.count | html %]">
                                                 <span class="tdlabel">Checkouts: </span>
@@ -150,7 +151,7 @@
     <script>
         $(function() {
             $("#topissuest").dataTable($.extend(true, {}, dataTablesDefaults, {
-                "sorting": [[2, "desc"]],
+                "sorting": [[3, "desc"]],
                 "columnDefs": [
                     { "sortable": false, "searchable": false, 'targets': [ 'NoSort' ] },
                     { "type": "anti-the", "targets" : [ "anti-the" ] }
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 230cc266e9..15fd6e52d2 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -239,7 +239,7 @@ foreach my $itemtype ( keys %{$itemtypes} ) {
 my $itype_or_itemtype = (C4::Context->preference("item-level_itypes"))?'itype':'itemtype';
 my @advancedsearchesloop;
 my $cnt;
-my $advanced_search_types = C4::Context->preference("AdvancedSearchTypes") || "itemtypes";
+my $advanced_search_types = C4::Context->preference("OpacAdvancedSearchTypes") || "itemtypes";
 my @advanced_search_types = split(/\|/, $advanced_search_types);
 
 my $hidingrules = C4::Context->yaml_preference('OpacHiddenItems') // {};
diff --git a/opac/opac-topissues.pl b/opac/opac-topissues.pl
index f185702e32..43830ccfd5 100755
--- a/opac/opac-topissues.pl
+++ b/opac/opac-topissues.pl
@@ -64,7 +64,7 @@ if (!$do_it && C4::Context->userenv && C4::Context->userenv->{'branch'} ) {
 }
 my $itemtype = $input->param('itemtype') || '';
 my $timeLimit = $input->param('timeLimit') || 3;
-my $advanced_search_types = C4::Context->preference('AdvancedSearchTypes');
+my $advanced_search_types = C4::Context->preference('OpacAdvancedSearchTypes');
 my @advanced_search_types = split /\|/, $advanced_search_types;
 
 my $params = {