diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/select_manager.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/select_manager.inc
index a2fe25ea51..2b3f496adc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/select_manager.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/select_manager.inc
@@ -2,20 +2,8 @@
 [% IF add_modal %]
     [% SET columns = ['cardnumber','name','category','branch','action'] %]
     [% SET filter = filter %]
-    [% PROCESS patron_search_modal
-        columns => columns,
-        modal_title => t("Select manager"),
-        patron_search_modal_id => 'patron_search_modal_manager',
-        table_id => 'patron_search_modal_manager_table'
-    %]
-    [% PROCESS patron_search_js
-        columns => columns,
-        actions => ["select"],
-        preview_on_name_click => 1,
-        table_id => 'patron_search_modal_manager_table',
-        callback => 'select_manager'
-        empty_table_settings => 1
-    %]
+    [% PROCESS patron_search_modal columns => columns, modal_title => t("Select manager"), patron_search_modal_id => 'patron_search_modal_manager', table_id => 'patron_search_modal_manager_table' %]
+    [% PROCESS patron_search_js columns => columns, actions => ["select"], preview_on_name_click => 1, table_id => 'patron_search_modal_manager_table', callback => 'select_manager' empty_table_settings => 1 %]
 [% END %]
 <script>
     function select_manager(borrowernumber, borrower) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
index 47fd429d12..e1628739d5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
@@ -392,10 +392,7 @@
                                 <label for="borrowernumber">Patron ID:</label>
                                 <input name="borrowernumber" id="borrowernumber" type="text" value="[% request.borrowernumber | html %]" />
                             </li>
-                            [% PROCESS select_manager_form
-                                manager => request.manager
-                                required_permission => CAN_user_ill
-                            %]
+                            [% PROCESS select_manager_form manager => request.manager required_permission => CAN_user_ill %]
                             <li class="biblio_id">
                                 <label for="biblio_id" class="biblio_id">Bibliographic record ID:</label>
                                 <input name="biblio_id" id="biblio_id" type="text" value="[% request.biblio_id | html %]" />
@@ -651,10 +648,7 @@
                                     <a href="[% borrowerlink | url %]" title="View borrower details"> [% request.patron.firstname _ " " _ request.patron.surname _ " [" _ request.patron.cardnumber _ "]" | html %] </a>
                                 </li>
                             [% END %]
-                            [% PROCESS select_manager_show
-                                manager => request.manager
-                                display => "fieldset"
-                            %]
+                            [% PROCESS select_manager_show manager => request.manager display => "fieldset" %]
                             [% IF request.biblio_id %]
                                 <li class="biblio_id">
                                     <span class="label biblio_id">Bibliographic record ID:</span>
@@ -1130,7 +1124,8 @@
     [% INCLUDE 'calendar.inc' %]
     [% INCLUDE 'select2.inc' %]
     [% IF op == 'edit_action' %]
-        [% INCLUDE 'select_manager.inc'
+        [%
+            INCLUDE 'select_manager.inc'
             add_modal => 1
             manager => request.manager
             filter => 'ill_users'
diff --git a/t/db_dependent/api/v1/ill_users.t b/t/db_dependent/api/v1/ill_users.t
index c528fc8099..48e30b17c3 100755
--- a/t/db_dependent/api/v1/ill_users.t
+++ b/t/db_dependent/api/v1/ill_users.t
@@ -61,7 +61,8 @@ subtest 'list() tests' => sub {
     ## Authorized user tests
     # One erm_user created, should get returned
     $librarian->discard_changes;
-    $t->get_ok("//$userid:$password@/api/v1/ill/users")->status_is(200)
+    $t->get_ok("//$userid:$password@/api/v1/ill/users")
+        ->status_is(200)
         ->json_is( [ $librarian->to_api( { user => $librarian } ) ] );
 
     my $another_erm_user = $builder->build_object(
@@ -72,7 +73,8 @@ subtest 'list() tests' => sub {
     );
 
     # Two erm_users created, only self is returned without permission to view_any_borrower
-    $t->get_ok("//$userid:$password@/api/v1/ill/users")->status_is(200)
+    $t->get_ok("//$userid:$password@/api/v1/ill/users")
+        ->status_is(200)
         ->json_is( [ $librarian->to_api( { user => $librarian } ) ] );
 
     my $dbh = C4::Context->dbh;
@@ -82,12 +84,14 @@ subtest 'list() tests' => sub {
     );
 
     # Two erm_users created, they should both be returned
-    $t->get_ok("//$userid:$password@/api/v1/ill/users")->status_is(200)
+    $t->get_ok("//$userid:$password@/api/v1/ill/users")
+        ->status_is(200)
         ->json_is(
         [ $librarian->to_api( { user => $librarian } ), $another_erm_user->to_api( { user => $another_erm_user } ) ] );
 
     # Warn on unsupported query parameter
-    $t->get_ok("//$userid:$password@/api/v1/ill/users?blah=blah")->status_is(400)
+    $t->get_ok("//$userid:$password@/api/v1/ill/users?blah=blah")
+        ->status_is(400)
         ->json_is( [ { path => '/query/blah', message => 'Malformed query string' } ] );
 
     my $patron = $builder->build_object(