diff --git a/installer/data/mysql/atomicupdate/bug_26296-Replace-comma-with-pipe-in-OPACSuggestion-preferences.perl b/installer/data/mysql/atomicupdate/bug_26296-Replace-comma-with-pipe-in-OPACSuggestion-preferences.perl
new file mode 100644
index 0000000000..d1448086f7
--- /dev/null
+++ b/installer/data/mysql/atomicupdate/bug_26296-Replace-comma-with-pipe-in-OPACSuggestion-preferences.perl
@@ -0,0 +1,15 @@
+$DBversion = 'XXX'; # will be replaced by the RM
+if( CheckVersion( $DBversion ) ) {
+    # you can use $dbh here like:
+    # $dbh->do( "ALTER TABLE biblio ADD COLUMN badtaste int" );
+
+    # or perform some test and warn
+    # if( !column_exists( 'biblio', 'biblionumber' ) ) {
+    #    warn "There is something wrong";
+    # }
+
+    $dbh->do("UPDATE systempreferences SET value = REPLACE(value, ',', '|') WHERE variable IN ('OPACSuggestionMandatoryFields','OPACSuggestionUnwantedFields')");
+
+    # Always end with this (adjust the bug info)
+    NewVersion( $DBversion, 26296, "Replace comma with pipe in OPACSuggestion field preferences");
+}
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 de2634b5ff..80cb18c0e2 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
@@ -607,34 +607,14 @@ OPAC:
         -
             - "Fields that should be mandatory for patron purchase suggestions:"
             - pref: OPACSuggestionMandatoryFields
-              multiple:
-                title: Title
-                author: Author
-                copyrightdate: Copyright or publication date
-                isbn: ISBN, ISSN or other standard number
-                publishercode: Publisher name
-                collectiontitle: Collection title
-                place: Publication place
-                itemtype: Item type
-                branch: Library or branch
-                patronreason: Patron reason
-                note: Note
+              type: modalselect
+              source: suggestions
             - "<br />Note: if none of the above options are selected, 'Title' field would be mandatory anyway, by default."
         -
             - "Fields that should be hidden for patron purchase suggestions:"
             - pref: OPACSuggestionUnwantedFields
-              multiple:
-                author: Author
-                copyrightdate: Copyright or publication date
-                isbn: ISBN, ISSN or other standard number
-                publishercode: Publisher name
-                collectiontitle: Collection title
-                place: Publication place
-                itemtype: Item type
-                quantity: Quantity
-                branch: Library or branch
-                patronreason: Patron reason
-                note: Note
+              type: modalselect
+              source: suggestions
             - '<br />Note: Do not make <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OPACSuggestionMandatoryFields">OPACSuggestionMandatoryFields</a> unwanted fields '
         -
             - pref: OpacHiddenItems
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/suggestions.json b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/suggestions.json
new file mode 100644
index 0000000000..e351df2155
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/suggestions.json
@@ -0,0 +1,13 @@
+{
+    "author": "author",
+    "copyrightdate": "copyrightdate",
+    "isbn": "isbn",
+    "publishercode": "publishercode",
+    "collectiontitle": "collectiontitle",
+    "place": "place",
+    "quantity": "quantity",
+    "itemtype": "itemtype",
+    "branchcode": "branchcode",
+    "patronreason": "patronreason",
+    "note": "note"
+}
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
index 043441d8ce..6510f492c6 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
@@ -183,7 +183,7 @@
                                             [% END %]
                                             </li>
                                         [% END %]
-                                        [% UNLESS ( branch_hidden )%]
+                                        [% UNLESS ( branchcode_hidden )%]
                                             <li>
                                                 [% IF ( branchcode_required ) %]
                                                     <label for="branch" class="required">Library:</label>
diff --git a/opac/opac-suggestions.pl b/opac/opac-suggestions.pl
index 8f99595f1f..fcc95801aa 100755
--- a/opac/opac-suggestions.pl
+++ b/opac/opac-suggestions.pl
@@ -248,7 +248,7 @@ my $patron_reason_loop = GetAuthorisedValues("OPAC_SUG", "opac");
 my @mandatoryfields;
 if ( $op eq 'add' ) {
     my $fldsreq_sp = C4::Context->preference("OPACSuggestionMandatoryFields") || 'title';
-    @mandatoryfields = sort split(/\s*\,\s*/, $fldsreq_sp);
+    @mandatoryfields = sort split(/\s*\|\s*/, $fldsreq_sp);
     foreach (@mandatoryfields) {
         $template->param( $_."_required" => 1);
     }
@@ -271,7 +271,7 @@ my @unwantedfields;
 {
     last unless ($op eq 'add');
     my $fldsreq_sp = C4::Context->preference("OPACSuggestionUnwantedFields");
-    @unwantedfields = sort split(/\s*\,\s*/, $fldsreq_sp);
+    @unwantedfields = sort split(/\s*\|\s*/, $fldsreq_sp);
     foreach (@unwantedfields) {
         $template->param( $_."_hidden" => 1);
     }