diff --git a/C4/Search.pm b/C4/Search.pm
index 72ca5be060..8147e52564 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1189,7 +1189,7 @@ sub parseQuery {
             $query .= $operators[ $ii - 1 ] eq 'or' ? ' || ' : ' && '
               if ($query);
             $query .=
-              ( $operators[$ii] ? "$operators[$ii]:" : '' ) . $operands[$ii];
+              ( $indexes[$ii] ? "$indexes[$ii]:" : '' ) . $operands[$ii];
         }
         foreach my $limit (@limits) {
         }
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
index a461800025..70aae6237f 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
@@ -17,7 +17,7 @@ var q_array = new Array();  // will hold the search terms, if possible
 $(document).ready(function(){
     [% IF ( OpacHighlightedWords ) %]
         $('a.title').each(function() {
-            $(this).attr('href', $(this).attr('href') + '&query_desc=[% query_desc | url %]');
+            $(this).attr('href', $(this).attr('href') + '&query_desc=[% query_desc | uri %]');
         });
     [% END %]
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
index 30682c4bb5..04d02bae9b 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
@@ -105,7 +105,7 @@ function highlightOn() {
 $(document).ready(function(){
     [% IF ( OpacHighlightedWords ) %]
         $('a.title').each(function() {
-            $(this).attr('href', $(this).attr('href') + '&query_desc=[% query_desc | url %]');
+            $(this).attr('href', $(this).attr('href') + '&query_desc=[% query_desc | uri %]');
         });
     [% END %]