diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
index d0e834b57a..e45dff7e18 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
@@ -531,9 +531,9 @@
                                                                         id="subfield[% iteminformatio.serialid | html %][% iteminformatio.countitems | html %][% iteminformatio.subfield | html %][% iteminformatio.random | html %]"
                                                                     >
                                                                         [% IF (iteminformatio.mandatory) %]
-                                                                            <label class="required">[% iteminformatio.subfield | html %] - [% iteminformatio.marc_lib | $raw %]</label>
+                                                                            <label class="required">[% iteminformatio.subfield | html %] - [% iteminformatio.marc_lib | html %]</label>
                                                                         [% ELSE %]
-                                                                            <label>[% iteminformatio.subfield | html %] - [% iteminformatio.marc_lib | $raw %]</label>
+                                                                            <label>[% iteminformatio.subfield | html %] - [% iteminformatio.marc_lib | html %]</label>
                                                                         [% END %]
 
                                                                         [% IF ( iteminformatio.marc_value.type == 'select' ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
index d9e91e55c0..bc0b357e48 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
@@ -218,7 +218,7 @@
                 [% FOREACH subfield_loo IN innerloo.subfield_loop %]
                     [% IF ( subfield_loo.mandatory ) %]subfields.push("[% subfield_loo.id | html %]");
                         tab.push("[% BIG_LOO.number | html %]");
-                        label.push("[% subfield_loo.marc_lib | $raw %]");
+                        label.push("[% subfield_loo.marc_lib | html %]");
                     [% END %]
                 [% END %]
             [% END %]
@@ -680,7 +680,7 @@
                                                                 <div class="subfieldcode">
                                                                     <span class="handle">&#xf58e;</span>
                                                                     <input type="text"
-                                                                        title="[% subfield_loo.marc_lib | $raw %]"
+                                                                        title="[% subfield_loo.marc_lib | html %]"
                                                                         style=" [% IF ( innerloo.fixedfield ) %]display:none; [% END %]border:0;"
                                                                         name="tag_[% subfield_loo.tag | html %]_code_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]"
                                                                         value="[% subfield_loo.subfield | html %]"
@@ -706,7 +706,7 @@
                                                                     [% ELSE %]
                                                                         <label for="tag_[% subfield_loo.tag | html %]_subfield_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]" class="labelsubfield">
                                                                     [% END %]
-                                                                        [% subfield_loo.marc_lib | $raw %]
+                                                                        [% subfield_loo.marc_lib | html %]
                                                                     </label>
                                                                 </div> <!-- /.subfield -->
                                                             [% END # UNLESS advancedMARCEditor %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
index 14cba537df..a08bc31521 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
@@ -537,7 +537,7 @@
                         [%- FOREACH subfield_loo IN innerloo.subfield_loop %]
                             [%- IF ( subfield_loo.mandatory ) %]subfields.push("[% subfield_loo.id | html %]");
                                 tab.push("[% BIG_LOO.number | html %]");
-                                label.push("[% subfield_loo.marc_lib | $raw %]");
+                                label.push("[% subfield_loo.marc_lib | html %]");
                             [%- END %]
                         [%- END %]
                     [%- END %]
@@ -552,7 +552,7 @@
                         [%- FOREACH subfield_loo IN innerloo.subfield_loop %]
                             [%- IF ( subfield_loo.important ) %]subfields.push("[% subfield_loo.id | html %]");
                                 tab.push("[% BIG_LOO.number | html %]");
-                                label.push("[% subfield_loo.marc_lib | $raw %]");
+                                label.push("[% subfield_loo.marc_lib | html %]");
                             [%- END %]
                         [%- END %]
                     [%- END %]
@@ -1132,7 +1132,7 @@
                                                     <div class="subfieldcode">
                                                         <span class="handle">&#xf58e;</span>
                                                         <input type="text"
-                                                                title="[% subfield_loo.marc_lib | $raw %]"
+                                                                title="[% subfield_loo.marc_lib | html %]"
                                                                 style=" [% IF ( innerloo.fixedfield ) %]display:none; [% END %]border:0;"
                                                                 name="tag_[% subfield_loo.tag | html %]_code_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]"
                                                                 value="[% subfield_loo.subfield | html %]"
@@ -1154,7 +1154,7 @@
                                                             [% ELSE %]
                                                                 <label for="tag_[% subfield_loo.tag | html %]_subfield_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]" class="labelsubfield">
                                                             [% END %]
-                                                            [% subfield_loo.marc_lib | $raw %]
+                                                            [% subfield_loo.marc_lib | html %]
                                                             </label>
                                                         </div>
                                                     [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
index 40d5f4cfaf..b7e742623b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
@@ -342,9 +342,9 @@
                                                                                 id="subfield[% item.serialid | html %][% item.countitems | html %][% iteminformatio.subfield | html %][% iteminformatio.random | html %]"
                                                                             >
                                                                                 [% IF (iteminformatio.mandatory) %]
-                                                                                    <label class="required">[% iteminformatio.subfield | html %] - [% iteminformatio.marc_lib | $raw %]</label>
+                                                                                    <label class="required">[% iteminformatio.subfield | html %] - [% iteminformatio.marc_lib | html %]</label>
                                                                                 [% ELSE %]
-                                                                                    <label>[% iteminformatio.subfield | html %] - [% iteminformatio.marc_lib | $raw %]</label>
+                                                                                    <label>[% iteminformatio.subfield | html %] - [% iteminformatio.marc_lib | html %]</label>
                                                                                 [% END %]
                                                                                 [% IF ( iteminformatio.marc_value.type == 'select' ) %]
                                                                                     <select name="field_value" class="select2 input_marceditor">
@@ -538,9 +538,9 @@
                                                                             id="subfield[% newserialloo.serialid | html %][% newserialloo.countitems | html %][% iteminformatio.subfield | html %][% iteminformatio.random | html %]"
                                                                         >
                                                                             [% IF (iteminformatio.mandatory) %]
-                                                                                <label class="required">[% iteminformatio.subfield | html %] - [% iteminformatio.marc_lib | $raw %]</label>
+                                                                                <label class="required">[% iteminformatio.subfield | html %] - [% iteminformatio.marc_lib | html %]</label>
                                                                             [% ELSE %]
-                                                                                <label>[% iteminformatio.subfield | html %] - [% iteminformatio.marc_lib | $raw %]</label>
+                                                                                <label>[% iteminformatio.subfield | html %] - [% iteminformatio.marc_lib | html %]</label>
                                                                             [% END %]
                                                                             [% IF ( iteminformatio.marc_value.type == 'select' ) %]
                                                                                 <select name="field_value" class="select2 input_marceditor">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt
index 412ba08f89..aeffeac536 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt
@@ -4,9 +4,9 @@
         <li style="[% iteminfo.hidden | html %];">
             <div class="subfield_line" id="subfield[% iteminfo.serialid | html %][% iteminfo.countitems | html %][% iteminfo.subfield | html %][% iteminfo.random | html %]">
                 [% IF (iteminfo.mandatory) %]
-                    <label class="required">[% iteminfo.subfield | html %] - [% iteminfo.marc_lib | $raw %]</label>
+                    <label class="required">[% iteminfo.subfield | html %] - [% iteminfo.marc_lib | html %]</label>
                 [% ELSE %]
-                    <label>[% iteminfo.subfield | html %] - [% iteminfo.marc_lib | $raw %]</label>
+                    <label>[% iteminfo.subfield | html %] - [% iteminfo.marc_lib | html %]</label>
                 [% END %]
                 [% IF ( iteminfo.marc_value.type == 'select' ) %]
                     <select name="field_value" class="input_marceditor">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt
index 2279b6606b..20d8cb99be 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt
@@ -53,7 +53,7 @@
                                         <tr><th colspan="2">[% tab0X.tag | html %]</th></tr>
                                         [% FOREACH subfiel IN tab0X.subfield %]
                                             <tr>
-                                                <td>[% subfiel.marc_lib | $raw %]</td>
+                                                <td>[% subfiel.marc_lib | html %]</td>
                                                 <td>[% subfiel.marc_value | html %]</td>
                                             </tr>
                                         [% END %]
@@ -62,7 +62,7 @@
                                         <tr><th colspan="2">[% tab1X.tag | html %]</th></tr>
                                         [% FOREACH subfiel IN tab1X.subfield %]
                                             <tr>
-                                                <td>[% subfiel.marc_lib | $raw %]</td>
+                                                <td>[% subfiel.marc_lib | html %]</td>
                                                 <td>[% subfiel.marc_value | html %]</td>
                                             </tr>
                                         [% END %]
@@ -72,7 +72,7 @@
                                         <tr><th colspan="2">[% tab2X.tag | html %]</th></tr>
                                         [% FOREACH subfiel IN tab2X.subfield %]
                                             <tr>
-                                                <td>[% subfiel.marc_lib | $raw %]</td>
+                                                <td>[% subfiel.marc_lib | html %]</td>
                                                 <td>[% subfiel.marc_value | html %]</td>
                                             </tr>
                                         [% END %]
@@ -82,7 +82,7 @@
                                         <tr><th colspan="2">[% tab3X.tag | html %]</th></tr>
                                         [% FOREACH subfiel IN tab3X.subfield %]
                                             <tr>
-                                                <td>[% subfiel.marc_lib | $raw %]</td>
+                                                <td>[% subfiel.marc_lib | html %]</td>
                                                 <td>[% subfiel.marc_value | html %]</td>
                                             </tr>
                                         [% END %]
@@ -92,7 +92,7 @@
                                         <tr><th colspan="2">[% tab4X.tag | html %]</th></tr>
                                         [% FOREACH subfiel IN tab4X.subfield %]
                                             <tr>
-                                                <td>[% subfiel.marc_lib | $raw %]</td>
+                                                <td>[% subfiel.marc_lib | html %]</td>
                                                 <td>[% subfiel.marc_value | html %]</td>
                                             </tr>
                                         [% END %]
@@ -102,7 +102,7 @@
                                         <tr><th colspan="2">[% tab5X.tag | html %]</th></tr>
                                         [% FOREACH subfiel IN tab5X.subfield %]
                                             <tr>
-                                                <td>[% subfiel.marc_lib | $raw %]</td>
+                                                <td>[% subfiel.marc_lib | html %]</td>
                                                 <td>[% subfiel.marc_value | html %]</td>
                                             </tr>
                                         [% END %]
@@ -112,7 +112,7 @@
                                         <tr><th colspan="2">[% tab6X.tag | html %]</th></tr>
                                         [% FOREACH subfiel IN tab6X.subfield %]
                                             <tr>
-                                                <td>[% subfiel.marc_lib | $raw %]</td>
+                                                <td>[% subfiel.marc_lib | html %]</td>
                                                 <td>[% subfiel.marc_value | html %]</td>
                                             </tr>
                                         [% END %]
@@ -122,7 +122,7 @@
                                         <tr><th colspan="2">[% tab7X.tag | html %]</th></tr>
                                         [% FOREACH subfiel IN tab7X.subfield %]
                                             <tr>
-                                                <td>[% subfiel.marc_lib | $raw %]</td>
+                                                <td>[% subfiel.marc_lib | html %]</td>
                                                 <td>[% subfiel.marc_value | html %]</td>
                                             </tr>
                                         [% END %]
@@ -132,7 +132,7 @@
                                         <tr><th colspan="2">[% tab8X.tag | html %]</th></tr>
                                         [% FOREACH subfiel IN tab8X.subfield %]
                                             <tr>
-                                                <td>[% subfiel.marc_lib | $raw %]</td>
+                                                <td>[% subfiel.marc_lib | html %]</td>
                                                 <td>[% subfiel.marc_value | html %]</td>
                                             </tr>
                                         [% END %]
@@ -142,7 +142,7 @@
                                         <tr><th colspan="2">[% tab9X.tag | html %]</th></tr>
                                         [% FOREACH subfiel IN tab9X.subfield %]
                                             <tr>
-                                                <td>[% subfiel.marc_lib | $raw %]</td>
+                                                <td>[% subfiel.marc_lib | html %]</td>
                                                 <td>[% subfiel.marc_value | html %]</td>
                                             </tr>
                                         [% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt
index 7fe6d394a6..c56f3cc8e0 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt
@@ -72,7 +72,7 @@
                         <ul>
                             [% FOREACH subfiel IN Tag0X.subfield %]
                                 <li
-                                    ><strong>[% subfiel.marc_lib | $raw %]:</strong> [% IF subfiel.isurl %]
+                                    ><strong>[% subfiel.marc_lib | html %]:</strong> [% IF subfiel.isurl %]
                                         <a href="[% subfiel.marc_value | url %]">[% subfiel.marc_value | html %]</a>
                                     [% ELSE %]
                                         [% subfiel.marc_value | html %]