diff --git a/Koha/SearchEngine/Elasticsearch/Search.pm b/Koha/SearchEngine/Elasticsearch/Search.pm
index a1598d795c..6340ebe2b2 100644
--- a/Koha/SearchEngine/Elasticsearch/Search.pm
+++ b/Koha/SearchEngine/Elasticsearch/Search.pm
@@ -42,6 +42,7 @@ use Modern::Perl;
 
 use base qw(Koha::SearchEngine::Elasticsearch);
 use C4::Context;
+use C4::AuthoritiesMarc;
 use Koha::ItemTypes;
 use Koha::AuthorisedValues;
 use Koha::SearchEngine::QueryBuilder;
diff --git a/authorities/ysearch.pl b/authorities/ysearch.pl
index 4a5ae796a7..9861f877e6 100755
--- a/authorities/ysearch.pl
+++ b/authorities/ysearch.pl
@@ -33,9 +33,10 @@ use JSON;
 
 use C4::Context;
 use C4::Charset;
-use C4::AuthoritiesMarc;
 use C4::Auth qw/check_cookie_auth/;
 use C4::Output;
+use Koha::SearchEngine::Search;
+use Koha::SearchEngine::QueryBuilder;
 
 my $query = new CGI;
 
@@ -60,7 +61,18 @@ if ( $auth_status ne "ok" ) {
     my $resultsperpage = 50;
     my $startfrom = 0;
 
-    my ( $results, $total ) = SearchAuthorities( \@marclist, \@and_or, \@excluding, \@operator, \@value, $startfrom * $resultsperpage, $resultsperpage, $authtypecode, $orderby );
+    my $builder = Koha::SearchEngine::QueryBuilder->new(
+        { index => $Koha::SearchEngine::AUTHORITIES_INDEX } );
+    my $searcher = Koha::SearchEngine::Search->new(
+        { index => $Koha::SearchEngine::AUTHORITIES_INDEX } );
+    my $search_query = $builder->build_authorities_query_compat(
+        \@marclist, \@and_or, \@excluding, \@operator,
+        \@value, $authtypecode, $orderby
+    );
+    my $offset = $startfrom * $resultsperpage;
+    my ( $results, $total ) =
+        $searcher->search_auth_compat( $search_query, $offset,
+        $resultsperpage );
 
     my %used_summaries; # hash to avoid duplicates
     my @summaries;
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 2e853e281a..f629f5d814 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/auth-finder-search.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/auth-finder-search.js
@@ -23,7 +23,7 @@ $(document).ready(function(){
                     and_or: "and",
                     operator: "contains",
                     orderby: "HeadingAsc",
-                    querytype: "marclist"
+                    querytype: "all"
                 },
                 success: function(data) {
                     response( $.map( data, function( item ) {