diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
index 872388b317..c49e426002 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
@@ -94,9 +94,9 @@
             <li>
                 <div class="subfield_line" style="[% subfield.visibility | html %]" id="subfield[% subfield.tag | html %][% subfield.subfield | html %][% subfield.random | html %]">
                     [% IF ( subfield.mandatory ) %]
-                        <label class="required">[% subfield.subfield | html %] - [% subfield.marc_lib | $raw %]</label>
+                        <label class="required">[% subfield.subfield | html %] - [% subfield.marc_lib | html %]</label>
                     [% ELSE %]
-                       <label>[% subfield.subfield | html %] - [% subfield.marc_lib | $raw %]</label>
+                       <label>[% subfield.subfield | html %] - [% subfield.marc_lib | html %]</label>
                     [% END %]
 
                     [% SET mv = subfield.marc_value %]
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 09066e6795..4e10e010df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
@@ -437,9 +437,9 @@
                                                                     <li style="[% iteminformatio.hidden | html %];">
                                                                         <div class="subfield_line" 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 230b683801..9dbecaf532 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
@@ -247,7 +247,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 %]
@@ -692,7 +692,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 ( subfield_loo.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 %]"
@@ -718,7 +718,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 4b806cf4c7..4fb8035e4f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
@@ -580,7 +580,7 @@ $(document).ready(function(){
                     [% 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 %]
@@ -595,7 +595,7 @@ $(document).ready(function(){
                     [% 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 %]
@@ -1153,7 +1153,7 @@ $(document).ready(function(){
                                                     <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 ( subfield_loo.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 %]"
@@ -1175,7 +1175,7 @@ $(document).ready(function(){
                                                             [% 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 e41409278f..445977f0c6 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
@@ -294,9 +294,9 @@ $(document).ready(function() {
         <ol>[% FOREACH iteminformatio IN item.iteminformation %]<li>
                <div class="subfield_line" style="[% iteminformatio.hidden | html %]" 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">
@@ -449,9 +449,9 @@ $(document).ready(function() {
         <ol>[% FOREACH iteminformatio IN newserialloo.iteminformation %]<li>
                <div class="subfield_line" style="[% iteminformatio.hidden | html %]" 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 c8a3b1fd24..04a73eb460 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt
@@ -8,9 +8,9 @@
     [% END %]
       <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 83f2a091cd..ed541e57e4 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt
@@ -39,7 +39,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 %]
@@ -48,7 +48,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 %]
@@ -58,7 +58,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 %]
@@ -68,7 +68,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 %]
@@ -78,7 +78,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 %]
@@ -88,7 +88,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 %]
@@ -98,7 +98,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 %]
@@ -108,7 +108,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 %]
@@ -118,7 +118,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 %]
@@ -128,7 +128,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 6518040de7..2f2a3f9347 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
@@ -61,7 +61,7 @@
                                 <p><strong>[% Tag0X.tag | html %]</strong></p>
                                 <ul>
                                 [% FOREACH subfiel IN Tag0X.subfield %]
-                                    <li><strong>[% subfiel.marc_lib | $raw %]:</strong>
+                                    <li><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 %][% END %]</li>
                                 [% END %]