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 64533ec08e..daa46ee65c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
@@ -1,4 +1,5 @@
 [% USE raw %]
+[% USE To %]
 [% USE Koha %]
 [% USE KohaDates %]
 [% USE TablesSettings %]
@@ -326,12 +327,13 @@
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
-    <script nonce="[% Koha.CSPNonce | $raw %]">
+    <script nonce="[% Koha.CSPNonce | $raw %]" data-tt-allowed="true">
         var table_settings = [% TablesSettings.GetTableSettings( 'cataloguing', 'addbooks', 'reservoir-table', 'json' ) | $raw %]
         const interface = "[% interface | html %]";
         const theme = "[% theme | html %]";
         const biblionumber = "[% biblionumber | html %]";
         var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber | html %]";
+        var z3950_search_params = [% To.json(z3950_search_params || []) | $raw %];
     </script>
     <script nonce="[% Koha.CSPNonce | $raw %]">
         $(document).ready(function () {
@@ -414,9 +416,9 @@
         /* provide Z3950 search points */
         function GetZ3950Terms(fw){
             var strQuery="&frameworkcode=" + fw;
-            [% FOREACH z3950_search_param IN z3950_search_params %]
-                strQuery += "&" + "[% z3950_search_param.name | uri %]" + "=" + "[% z3950_search_param.value | uri %]";
-            [% END %]
+            z3950_search_params.forEach(function(z3950_search_param) {
+                strQuery += "&" + z3950_search_param.name + "=" + z3950_search_param.value;
+            });
             return strQuery;
         }
     </script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
index 3edfcd6a15..754bf7e14f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
@@ -24,12 +24,9 @@
 [% INCLUDE 'doc-head-close.inc' %]
 [% Asset.css("css/addbiblio.css") | $raw %]
 [% INCLUDE 'datatables.inc' %]
-<script nonce="[% Koha.CSPNonce | $raw %]">
-    [% IF Koha.Preference('CreateAVFromCataloguing') && CAN_user_parameters_manage_auth_values %]
-        var auth_values_creation = 1;
-    [% ELSE %]
-        var auth_values_creation = 0;
-    [% END %]
+<script nonce="[% Koha.CSPNonce | $raw %]" data-tt-allowed="true">
+    var auth_values_creation = [% IF Koha.Preference('CreateAVFromCataloguing') && CAN_user_parameters_manage_auth_values %]1[% ELSE %]0[% END %];
+    var has_item_groups = "[% item_groups.size | html %]";
 </script>
 [% INCLUDE 'select2.inc' %]
 [% Asset.js("js/cataloging.js") | $raw %]
@@ -37,9 +34,6 @@
 [% INCLUDE 'calendar.inc' %]
 [% INCLUDE 'str/cataloging_additem.inc' %]
 [% Asset.js("js/cataloging_additem.js") | $raw %]
-<script nonce="[% Koha.CSPNonce | $raw %]">
-    var has_item_groups = "[% item_groups.size | html %]";
-</script>
 <style nonce="[% Koha.CSPNonce | $raw %]">
     .flatpickr_wrapper input {
         width: 100%;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt
index 70def89ebc..da7cc85691 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt
@@ -231,7 +231,7 @@
 [% END %]
 
 [% MACRO jsinclude BLOCK %]
-    <script nonce="[% Koha.CSPNonce | $raw %]">
+    <script nonce="[% Koha.CSPNonce | $raw %]" data-tt-allowed="true">
         $(document).ready(function() {
 
             $("#newRecord").click(function(){
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt
index 54ed562017..ebada62c04 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt
@@ -63,10 +63,18 @@
     [% INCLUDE 'datatables.inc' %]
     [% INCLUDE 'js-date-format.inc' %]
     [% INCLUDE 'js-biblio-format.inc' %]
-    <script nonce="[% Koha.CSPNonce | $raw %]">
+    <script nonce="[% Koha.CSPNonce | $raw %]" data-tt-allowed="true">
         logged_in_user_borrowernumber = [% logged_in_user.borrowernumber | html %];
 
         var table_settings = [% TablesSettings.GetTableSettings('cataloguing', 'concerns', 'table_concerns', 'json') | $raw %];
+
+        var statuses = [];
+        [% FOR st IN status %]
+            statuses.push({
+                authorised_value: "[% st.authorised_value | html %]",
+                lib: "[% st.lib | html %]",
+            });
+        [% END %]
     </script>
     <script nonce="[% Koha.CSPNonce | $raw %]">
         $(document).ready(function () {
@@ -253,15 +261,13 @@
                 tickets.DataTable().draw();
             });
             adjust_filter_label();
-        });
-    </script>
-    <script nonce="[% Koha.CSPNonce | $raw %]">
-        $(document).ready(function() {
-            [% FOR st IN status %]
-            $('#[% st.authorised_value | html %]_filter').on("click", function() {
-                if ($("#hide_[% st.authorised_value | html %]").is(":checked")){
+
+            statuses.forEach(function(st){
+            const av = st.authorised_value;
+            $(`#${av}_filter`).on("click", function() {
+                if ($(`#${av}`).is(":checked")){
                     additional_filters.status.find((o, i) => {
-                        if (o["!="] === '[% st.authorised_value | html %]') {
+                        if (o["!="] === av) {
                             additional_filters.status.splice(i, 1);
                             return true; // stop searching
                         }
@@ -269,18 +275,18 @@
                     if ( additional_filters.status.length === 1 ){
                         delete additional_filters.status;
                     }
-                    $(this).html('<i class="fa fa-filter"></i> '+_("Filter ")+"[% st.lib | html %]");
+                    $(this).html('<i class="fa fa-filter"></i> '+_("Filter ")+st.lib);
                 } else {
                     if (!additional_filters.hasOwnProperty("status")) {
                         additional_filters.status = [ '-and' ];
                     }
-                    additional_filters.status.push({ '!=': "[% st.authorised_value | html %]" });
-                    $(this).html('<i class="fa fa-bars"></i> '+_("Include ")+"[% st.lib | html %]");
+                    additional_filters.status.push({ '!=': av});
+                    $(this).html('<i class="fa fa-bars"></i> '+_("Include ")+st.lib);
                 }
-                $("#hide_[% st.authorised_value | html %]").prop("checked", !$("#hide_[% st.authorised_value | html %]").is(":checked"));
+                $(`#hide_${av}`).prop("checked", !$(`#hide${av}`).is(":checked"));
                 tickets.DataTable().draw();
             });
-            [% END %]
+            });
         });
     </script>
     [% INCLUDE 'select2.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
index dbb2bbada0..588b35b732 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
@@ -225,7 +225,7 @@
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/merge-record.js") | $raw %]
-    <script nonce="[% Koha.CSPNonce | $raw %]">
+    <script nonce="[% Koha.CSPNonce | $raw %]" data-tt-allowed="true">
         [% UNLESS (result) %]
           [% IF (choosereference) %]
             function changeFramework(fw) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/EXAMPLE.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/EXAMPLE.tt
index c3694db7fa..eba56c0cad 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/EXAMPLE.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/EXAMPLE.tt
@@ -30,6 +30,10 @@
         </div>
     </nav>
 </form>
+<script nonce="[% Koha.CSPNonce | $raw %]" data-tt-allowed="true">
+    var index = "[% index | html %]";
+</script>
+
 <script nonce="[% Koha.CSPNonce | $raw %]">
     $(document).ready(function () {
         $('#return').focus();
@@ -38,7 +42,7 @@
     // The following function just puts back the value of the input #return
     // into the caller's field, referenced by index. And closes the popup.
     function submitMyForm() {
-        $(window.opener.document).find('#[% index | html %]').val($('#return').val() );
+        $(window.opener.document).find(`#${index}`).val($('#return').val() );
         window.close();
     }
 </script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
index 2ff8c7aa21..a8a08693eb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
@@ -280,7 +280,7 @@
     [% INCLUDE 'datatables.inc' %]
     [% INCLUDE 'z3950_search.inc' %]
     [% Asset.js("js/z3950_search.js") | $raw %]
-    <script nonce="[% Koha.CSPNonce | $raw %]">
+    <script nonce="[% Koha.CSPNonce | $raw %]" data-tt-allowed="true">
         var table_settings = [% TablesSettings.GetTableSettings( 'cataloguing', 'z3950_search', 'resultst', 'json' ) | $raw %];
     </script>
     <script nonce="[% Koha.CSPNonce | $raw %]">