diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
index 985bf59713..56ab6a79b9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
@@ -235,12 +235,12 @@
                         >
                     </li>
                     <li
-                        ><label for="branches">Library limitation: </label>
-                        <select id="branches" name="branches" multiple size="10">
+                        ><label for="library_limitation">Library limitation: </label>
+                        <select id="library_limitation" name="branches" multiple size="10">
                             <option value="">All libraries</option>
                             [% PROCESS options_for_libraries libraries => Branches.all( selected => attribute_type.library_limits ) %]
                         </select>
-                        <div class="hint">Select "All libraries" if this attribute type should always be displayed. Otherwise select libraries you want to associate with this value. </div>
+                        <div class="hint">Limits the use of this attribute to the selected libraries. </div>
                     </li>
                     <li>
                         <label for="category">Category: </label>
@@ -406,6 +406,7 @@
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/admin-menu.js") | $raw %]
     [% INCLUDE 'datatables.inc' %]
+    [% INCLUDE 'select2.inc' %]
     <script>
         $(document).ready(function () {
             function toggle_search_default() {
@@ -466,6 +467,9 @@
                     null
                 );
             });
+
+            $("#library_limitation")[0].style.minWidth = "450px";
+            $("#library_limitation").select2();
         });
     </script>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt
index e2fe82ee1a..e975b76132 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt
@@ -87,7 +87,7 @@
                 <legend>Checkout criteria:</legend>
                 <ol>
                     <li>
-                        <label for="categorycodes">Patrons' categories: </label>
+                        <label for="categorycodes">Patrons categories: </label>
                         [% SET categories = Categories.all() %]
                         <select id="categorycodes" name="categorycodes" multiple="multiple">
                             [% FOREACH cat IN categories %]
@@ -248,6 +248,7 @@
     [% Asset.js("js/tools-menu.js") | $raw %]
     [% INCLUDE 'calendar.inc' %]
     [% INCLUDE 'datatables.inc' %]
+    [% INCLUDE 'select2.inc' %]
     [% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %]
     <script>
         $(document).ready(function () {
@@ -297,6 +298,9 @@
                 }
                 return true;
             });
+
+            $("#extend_due_dates_form select[multiple]").css("minWidth", "450px");
+            $("#extend_due_dates_form select[multiple]").select2();
         });
     </script>
 [% END %]