diff --git a/authorities/ysearch.pl b/authorities/ysearch.pl
index d2a4ec2289..70b3560e49 100755
--- a/authorities/ysearch.pl
+++ b/authorities/ysearch.pl
@@ -53,12 +53,32 @@ if ( $auth_status ne "ok" ) {
 my @value        = $query->multi_param('term');
 my $searchtype   = $query->param('querytype');
 my @marclist     = ($searchtype);
+my $index        = $query->param('index');
 my $authtypecode = $query->param('authtypecode');
 my @and_or       = $query->multi_param('and_or');
 my @excluding    = $query->multi_param('excluding');
 my @operator     = $query->multi_param('operator');
 my $orderby      = $query->param('orderby');
 
+if ( C4::Context->preference('ConsiderHeadingUse') ) {
+    my $marcflavour = C4::Context->preference('marcflavour');
+    my $biblio_tag  = substr( $index, 4, 3 );
+    if ( $marcflavour eq 'MARC21' ) {
+        my $heading_use_search_field =
+              $biblio_tag =~ /^[127]/ ? 'Heading-use-main-or-added-entry'
+            : $biblio_tag =~ /^6/     ? 'Heading-use-subject-added-entry'
+            : $biblio_tag =~ /^[48]/  ? 'Heading-use-series-added-entry'
+            :                           undef;
+        if ($heading_use_search_field) {
+            push @marclist,  $heading_use_search_field;
+            push @and_or,    'and';
+            push @excluding, '';
+            push @operator,  'is';
+            push @value,     'a';
+        }
+    }
+}
+
 my $resultsperpage = 50;
 my $startfrom      = 0;
 
diff --git a/koha-tmpl/intranet-tmpl/prog/js/auth-finder-search.js b/koha-tmpl/intranet-tmpl/prog/js/auth-finder-search.js
index dfd81947c8..029d7258ed 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/auth-finder-search.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/auth-finder-search.js
@@ -19,6 +19,7 @@ $(document).ready(function () {
                 url: "/cgi-bin/koha/authorities/ysearch.pl",
                 dataType: "json",
                 data: {
+                    index: index,
                     authtypecode: authtypecode,
                     term: request.term,
                     op: "do_search",
@@ -52,6 +53,7 @@ $(document).ready(function () {
                 url: "/cgi-bin/koha/authorities/ysearch.pl",
                 dataType: "json",
                 data: {
+                    index: index,
                     authtypecode: authtypecode,
                     term: request.term,
                     op: "do_search",
@@ -85,6 +87,7 @@ $(document).ready(function () {
                 url: "/cgi-bin/koha/authorities/ysearch.pl",
                 dataType: "json",
                 data: {
+                    index: index,
                     authtypecode: authtypecode,
                     term: request.term,
                     op: "do_search",
@@ -118,6 +121,7 @@ $(document).ready(function () {
                 url: "/cgi-bin/koha/authorities/ysearch.pl",
                 dataType: "json",
                 data: {
+                    index: index,
                     authtypecode: authtypecode,
                     term: request.term,
                     op: "do_search",