diff --git a/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm b/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
index c5596f2e99..f36264e423 100644
--- a/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
+++ b/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
@@ -635,11 +635,12 @@ the provided string input.
 =cut
 
 our %scan_field_convert = (
-    'ti' => 'title',
-    'au' => 'author',
-    'su' => 'subject',
-    'se' => 'title-series',
-    'pb' => 'publisher',
+    'ti'      => 'title',
+    'au'      => 'author',
+    'su'      => 'subject',
+    'se'      => 'title-series',
+    'pb'      => 'publisher',
+    'callnum' => 'local-classification',
 );
 
 sub _build_scan_query {
diff --git a/admin/searchengine/elasticsearch/mappings.yaml b/admin/searchengine/elasticsearch/mappings.yaml
index f1bfdbe916..d3c8798b6f 100644
--- a/admin/searchengine/elasticsearch/mappings.yaml
+++ b/admin/searchengine/elasticsearch/mappings.yaml
@@ -2657,7 +2657,7 @@ biblios:
     label: local-classification
     mandatory: ~
     mappings:
-    - facet: ''
+    - facet: 1
       marc_field: 952o
       marc_type: marc21
       sort: 0
diff --git a/etc/zebradb/ccl.properties b/etc/zebradb/ccl.properties
index 985f7391bc..a71ea8f4c4 100644
--- a/etc/zebradb/ccl.properties
+++ b/etc/zebradb/ccl.properties
@@ -1039,7 +1039,7 @@ stack 1=8018
 issues 1=8019
 renewals 1=8020
 reserves 1=8021
-Local-classification 1=8022
+#Local-classification 1=8022
 barcode 1=8023
 bc barcode
 onloan 1=8024 14=1
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
index e4f6638743..4c8deeb929 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -418,6 +418,8 @@
                                 [% ELSE %]<option value="sn">ISBN</option>[% END %]
                                 [% IF ( header_pulldown ==  "ms_ss" ) %]<option selected="selected" value="ss">ISSN</option>
                                 [% ELSE %]<option value="ss">ISSN</option>[% END %]
+                                [% IF ( header_pulldown ==  "ms_callnum" ) %]<option selected="selected" value="callnum">Call number</option>
+                                [% ELSE %]<option value="callnum">Call number</option>[% END %]
                             </select>
                             [% IF ( scan_search_term_to_use ) %]
                                  <input type="text" name="q" id="scan-index-term" size="35" value="[% scan_search_term_to_use | html %]" />