diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
index 130f23f3ec..e342350bed 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
@@ -8,7 +8,18 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt
index 4589653c18..6dc6ded587 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt
@@ -11,11 +11,19 @@
[% INCLUDE 'prefs-admin-search.inc' %]
[% PROCESS 'keyboard_shortcuts.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
index 092b14d439..d6ace89e3c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
@@ -77,41 +77,95 @@
-
+
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
index 3fb5727045..a6f4df3812 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
@@ -14,15 +14,66 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'budgets-admin-search.inc' %]
-
+
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
index b9319e204c..745a0d8c30 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
@@ -19,33 +19,79 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'contracts-admin-search.inc' %]
-
+
+ [% IF ( else ) %]
+
+
+ Contracts
+
+
+ [% END %]
+
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
index 3b7724732a..82daa9b936 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
@@ -13,13 +13,25 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'budgets-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt
index 34a6446c13..ab261b3551 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt
@@ -11,7 +11,21 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
index 8325c171c1..c39c6a0a66 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
@@ -9,21 +9,68 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
index 53b35acbe6..7ce18daae0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
@@ -15,43 +15,124 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
index ab994eaed6..ae629c2bbd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
@@ -22,21 +22,61 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
index 7aefc88de1..a443b2a61e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
@@ -16,16 +16,46 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt
index 86ffb3c540..43359ce6c5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt
@@ -9,11 +9,26 @@
[% INCLUDE 'header.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
index 9371c2ced9..f084e0e785 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
@@ -16,16 +16,52 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
index cd7b7768f2..24eca1f5ba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
@@ -12,7 +12,21 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
index 6fd708df85..ac1bc66134 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
@@ -18,16 +18,52 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt
index c93e72c115..2ab0f0d245 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt
@@ -18,16 +18,51 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
index f95f95991b..b290005811 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
@@ -17,10 +17,73 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'patrons-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
index 4a78bcc8d9..73f8ff08c2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
@@ -10,8 +10,26 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
index e95e817f7a..5eedcbb4ef 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
@@ -10,16 +10,48 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'cities-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
index 93a4fd86f0..dc10fd7dc8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
@@ -30,18 +30,67 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
index d7ff05068d..aa4db9697a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
@@ -10,7 +10,24 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
index 80b20d790d..33a8111315 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
@@ -179,7 +179,21 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt
index 1ec55f85c4..5eeb3fbf9f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt
@@ -22,14 +22,38 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
index e427c76f7a..86136723de 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
@@ -16,11 +16,46 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'currencies-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
index 2efd51431d..85f83eb1db 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
@@ -23,14 +23,38 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt
index 022968b7c6..c48de8a5f4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt
@@ -11,16 +11,48 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'desks-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt
index db72d6bee3..c9a0410054 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt
@@ -31,7 +31,22 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
index db0ae0ad29..86be7a68ee 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
@@ -20,21 +20,52 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
index 9aaf0b732e..037e5c3052 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
@@ -20,21 +20,48 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt
index bec399c8fc..ba2ea671b2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt
@@ -45,7 +45,22 @@ table.grid td.default {
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt
index 3cf8791b21..ebc3c54e1a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt
@@ -9,12 +9,35 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
index 52eb80bd8e..48d9671904 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
@@ -10,11 +10,22 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
index 8ef4d32abe..f7da4012a1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
@@ -37,26 +37,73 @@ Data deleted
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt
index 8441157450..b9f3a4854d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt
@@ -10,7 +10,19 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
index edfe7b5ddc..9921b224fc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
@@ -12,11 +12,19 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]
-
+
[% FOR m IN messages %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
index 7a3d9d2be4..5a151e6241 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
@@ -28,29 +28,71 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
+ [% IF ( delete_confirm ) %]
+
+ Tag [% mss.tagfield | html %] Subfield structure
+
+
+
+ Confirm deletion of subfield [% mss.tagsubfield | html %]i
+
+
+ [% END %]
+
+ [% IF ( else ) %]
+
+
+ Tag [% tagfield | html %] Subfield structure
+
+
+ [% END %]
+
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
index beed047e47..00933fdfd0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
@@ -15,23 +15,83 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
index b9c21edbce..59ca6ef675 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
@@ -63,25 +63,48 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
index 59166299cc..56d76b9e0e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
@@ -10,7 +10,22 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
index 943d7aac81..f36716a7e0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
@@ -10,7 +10,44 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt
index 807e6cb99d..db9b1bfd5a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt
@@ -13,8 +13,19 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
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 c90046e057..1f90032bfb 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
@@ -25,18 +25,48 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
index dc9377fc01..efdbb88c11 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
@@ -17,7 +17,21 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
index 9a886bd9bc..e831f27801 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
@@ -16,7 +16,21 @@ a.add, a.delete {
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
[% INCLUDE 'blocking_errors.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt
index 446984440a..7630af8515 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt
@@ -11,7 +11,21 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
index d41e9ecc50..4d1f00a547 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
@@ -31,7 +31,21 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt
index 3983391274..e6bbcd71d3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt
@@ -10,7 +10,21 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
index 00c40e98a4..1a4c09efad 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
@@ -18,16 +18,44 @@ SMTP servers
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
index 31af56ab02..11c8332db9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
@@ -12,8 +12,75 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
index 5479b29e8a..7e7288bc9c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
@@ -16,7 +16,21 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt
index f8d018234d..b4328af34f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt
@@ -14,7 +14,21 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
index abff6947c4..2d969cdf42 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
@@ -22,11 +22,45 @@
[% INCLUDE 'header.inc' %]
[% INCLUDE 'z3950-admin-search.inc' %]
-
+