diff --git a/C4/Search.pm b/C4/Search.pm
index 09c19513d5..34d0fd7117 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -2251,7 +2251,7 @@ $arrayref = z3950_search_args($matchpoints)
 
 This function returns an array reference that contains the search parameters to be
 passed to the Z39.50 search script (z3950_search.pl). The array elements
-are hash refs whose keys are name, value and encvalue, and whose values are the
+are hash refs whose keys are name and value, and whose values are the
 name of a search parameter, the value of that search parameter and the URL encoded
 value of that parameter.
 
@@ -2262,7 +2262,7 @@ data is in a hash reference in $matchpoints, as returned by Biblio::GetBiblioDat
 
 If $matchpoints is a scalar, it is assumed to be an unnamed query descriptor, e.g.
 a general purpose search argument. In this case, the returned array contains only
-entry: the key is 'title' and the value and encvalue are derived from $matchpoints.
+entry: the key is 'title' and the value is derived from $matchpoints.
 
 If a search parameter value is undefined or empty, it is not included in the returned
 array.
@@ -2309,8 +2309,8 @@ sub z3950_search_args {
     my $array = [];
     for my $field (qw/ lccn isbn issn title author dewey subject /)
     {
-        my $encvalue = URI::Escape::uri_escape_utf8($bibrec->{$field});
-        push @$array, { name=>$field, value=>$bibrec->{$field}, encvalue=>$encvalue } if defined $bibrec->{$field};
+        push @$array, { name => $field, value => $bibrec->{$field} }
+          if defined $bibrec->{$field};
     }
     return $array;
 }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
index ff5d4bb6c2..f69a7cd5a4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
@@ -18,7 +18,7 @@
 	function GetZ3950Terms(){
 		var strQuery="&frameworkcode=";
 		[% FOREACH z3950_search_param IN z3950_search_params %]
-			strQuery += "&" + "[% z3950_search_param.name |html %]" + "=" + "[% z3950_search_param.encvalue |html %]";
+            strQuery += "&" + "[% z3950_search_param.name |uri %]" + "=" + "[% z3950_search_param.value |uri %]";
 		[% END %]
 		return strQuery;
 	}
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 7bb75f8fde..ff02a0a856 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -232,7 +232,7 @@ function PopupZ3950() {
 function GetZ3950Terms(){
 	var strQuery="&frameworkcode=";
 	[% FOREACH z3950_search_param IN z3950_search_params %]
-		strQuery += "&" + "[% z3950_search_param.name %]" + "=" + "[% z3950_search_param.encvalue %]";
+        strQuery += "&" + "[% z3950_search_param.name |uri %]" + "=" + "[% z3950_search_param.value |uri %]";
 	[% END %]
 	return strQuery;
 }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
index d2ab6a8c5a..4f73372009 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
@@ -28,7 +28,7 @@
     function GetZ3950Terms(fw){
         var strQuery="&frameworkcode=" + fw;
         [% FOREACH z3950_search_param IN z3950_search_params %]
-            strQuery += "&" + "[% z3950_search_param.name %]" + "=" + "[% z3950_search_param.encvalue %]";
+            strQuery += "&" + "[% z3950_search_param.name |uri %]" + "=" + "[% z3950_search_param.encvalue |uri %]";
         [% END %]
         return strQuery;
     }