diff --git a/cataloguing/value_builder/unimarc_field_4XX.pl b/cataloguing/value_builder/unimarc_field_4XX.pl
index 09d5b90600..34823912fa 100755
--- a/cataloguing/value_builder/unimarc_field_4XX.pl
+++ b/cataloguing/value_builder/unimarc_field_4XX.pl
@@ -395,8 +395,8 @@ sub plugin {
 
         my @numbers = ();
 
-        if ( $total > $resultsperpage ) {
-            for ( my $i = 1 ; $i < $total / $resultsperpage + 1 ; $i++ ) {
+        if ( $total_hits > $resultsperpage ) {
+            for ( my $i = 1 ; $i < $total_hits / $resultsperpage + 1 ; $i++ ) {
                 if ( $i < 16 ) {
                     my $highlight = 0;
                     ( $startfrom == ( $i - 1 ) ) && ( $highlight = 1 );
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt
index 178c70f67d..5aec7f2c98 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt
@@ -19,14 +19,12 @@
     [% IF ( Search ) %]
         <div id="UNIMARC_Field_4XX_search" class="page-section">
             <h2> Search on </h2>
-            <form name="f" method="post" action="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl">
-                [% INCLUDE 'csrf-token.inc' %]
-
+            <form name="f" method="get" action="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl">
                 <p>
                     <input type="hidden" name="plugin_name" value="unimarc_field_4XX.pl" />
                     <input type="hidden" name="index" value="[% index | html %]" />
                     <input type="hidden" name="result" value="unimarc field 4 [% index | html %]" />
-                    <input type="hidden" name="op" value="cud-do_search" />
+                    <input type="hidden" name="op" value="do_search" />
                     <label class="label100" for="searchbox">Any word</label>
                     <input type="text" name="search" id="searchbox" size="35" /><br />
                     <label for="itypeloop">Item type:</label>
@@ -59,7 +57,7 @@
                     [% ELSE %]
                         <a
                             class="resultnumber"
-                            href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=[% index | html %]&amp;startfrom=[% number.startfrom | html %]&amp;search=[% number.search |uri %]&amp;resultsperpage=[% number.resultsperpage | html %]&amp;type=intranet&amp;op=do_search"
+                            href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=[% index | html %]&amp;startfrom=[% number.startfrom | html %]&amp;search=[% search |uri %]&amp;resultsperpage=[% resultsperpage | html %]&amp;type=intranet&amp;op=do_search"
                             >[% number.number | html %]</a
                         >
                     [% END %]
@@ -152,7 +150,7 @@
                     [% ELSE %]
                         <a
                             class="resultnumber"
-                            href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=[% index | html %]&amp;startfrom=[% number.startfrom | html %]&amp;search=[% number.search |uri %]&amp;resultsperpage=[% number.resultsperpage | html %]&amp;type=intranet&amp;op=do_search"
+                            href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=[% index | html %]&amp;startfrom=[% number.startfrom | html %]&amp;search=[% search |uri %]&amp;resultsperpage=[% resultsperpage | html %]&amp;type=intranet&amp;op=do_search"
                         >
                             [% number.number | html %]
                         </a>