diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index e71c99fb92..98fbe56a49 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -8,7 +8,7 @@
             [% IF ( intranetbookbag ) %]
             <li><a href="#" id="cartmenulink">Cart<span id="basketcount"></span></a></li>
             [% END %]
-            [% IntranetNav %]
+            [% IntranetNav.raw %]
             <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">More <b class="caret"></b></a>
                 <ul class="dropdown-menu">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc
index 413f4bbbcf..e17afd6462 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc
@@ -1,10 +1,10 @@
 <script type="text/javascript">
 [% IF ( Koha.Preference('IntranetSlipPrinterJS') ) %]
-    [% Koha.Preference('IntranetSlipPrinterJS') %]
+    [% Koha.Preference('IntranetSlipPrinterJS').raw %]
 [% ELSE %]
     function printThenClose() {
         window.print();
         setTimeout('window.close()', 1);
     }
 [% END %]
-</script>
\ No newline at end of file
+</script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
index be0e5aa35d..37f2768643 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
@@ -161,7 +161,7 @@
             [% IF ( IntranetmainUserblock ) %]
                 <div class="yui-g" id="area-userblock">
                     <div class="user-info">
-                        [% IntranetmainUserblock %]
+                        [% IntranetmainUserblock.raw %]
                     </div>
                 </div>
             [% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc
index e2d707bdd3..06708d01e4 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc
@@ -27,7 +27,7 @@
         <div class="container-fluid">
             <div class="row-fluid">
                 <div id="opacheader">
-                    [% opacheader %]
+                    [% opacheader.raw %]
                 </div>
             </div>
         </div>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
index a80a291379..949ccf3279 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
@@ -125,7 +125,7 @@
             <div class="container-fluid">
                 <div class="row-fluid">
                     <div id="opacheader">
-                        [% opacheader %]
+                        [% opacheader.raw %]
                     </div>
                 </div>
             </div>
@@ -259,7 +259,7 @@
 
                             </form>
                         [% ELSE # / Koha.Preference('OpacCustomSearch') == '' %]
-                            [% Koha.Preference('OpacCustomSearch') %]
+                            [% Koha.Preference('OpacCustomSearch').raw %]
                         [% END # / Koha.Preference('OpacCustomSearch') == '' %]
                         </div> <!-- / .mastheadsearch -->
                     [% END # / UNLESS advsearch %]
@@ -323,7 +323,7 @@
                     [% END %]
                     [% IF Koha.Preference( 'NoLoginInstructions' ) %]
                         <div id="nologininstructions-modal">
-                            [% Koha.Preference( 'NoLoginInstructions' ) %]
+                            [% Koha.Preference( 'NoLoginInstructions' ).raw %]
                         </div>
                     [% END %]
                         [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]<div id="mpatronregistration"><p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p></div>[% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/navigation.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/navigation.inc
index 1926c1e2a5..7737089c54 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/navigation.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/navigation.inc
@@ -1,5 +1,5 @@
-<div id="opacnav">[% OpacNav %]</div>
+<div id="opacnav">[% OpacNav.raw %]</div>
 [% IF IsPatronPage %]
     <div id="usermenu">[% INCLUDE usermenu.inc %]</div>
 [% END %]
-<div id="opacnavbottom">[% OpacNavBottom %]</div>
+<div id="opacnavbottom">[% OpacNavBottom.raw %]</div>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
index 48bf1a2849..41017e0e7c 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
@@ -5,7 +5,7 @@
             <div class="row-fluid">
                 <div class="span12">
                     <div id="opaccredits" class="noprint">
-                        [% opaccredits %]
+                        [% opaccredits.raw %]
                     </div>
                 </div>
             </div>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
index d02b4c2bed..8e7d45265c 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
@@ -71,7 +71,7 @@
                     <a id="furthersearches" class="dropdown-toggle" data-toggle="dropdown" href="#">More searches <b class="caret"></b></a>
                         <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="furthersearches">
                             <li><a href="#" class="menu-inactive">Search for this title in:</a></li>
-                            [% OPACSearchForTitleIn %]
+                            [% OPACSearchForTitleIn.raw %]
                         </ul>
                 </div>
             </div>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
index 93da8b22db..995adfd795 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
@@ -63,7 +63,7 @@
 
     [% IF ( OPACResultsSidebar ) %]
         <div id="opacresultssidebar">
-            [% OPACResultsSidebar %]
+            [% OPACResultsSidebar.raw %]
         </div>
     [% END %]
 [% END # / IF opacfacets && facets_loop %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt
index 62fc15fd0d..9ae1298e92 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt
@@ -20,7 +20,7 @@
 </head>
 <body id="opac_maintenance" class="opac">
     [% IF ( opacheader ) %]
-        [% opacheader %]
+        [% opacheader.raw %]
     [% END %]
     <div class="container-fluid">
         <div class="row-fluid">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
index a267ef17fd..687582281a 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
@@ -157,7 +157,7 @@
                                 [% END %]
                                 <div id="nologininstructions">
                                     [% IF Koha.Preference('NoLoginInstructions') %]
-                                        [% Koha.Preference('NoLoginInstructions') %]
+                                        [% Koha.Preference('NoLoginInstructions').raw %]
                                     [% ELSE %]
                                         <h5>Don't have a password yet?</h5><p> If you don't have a password yet, stop by the circulation desk the next time you're in the library. We'll happily set one up for you.</p>
                                         <h5>Don't have a library card?</h5><p> If you don't have a library card, stop by your local library to sign up.</p>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt
index be4776c58b..89d05d319a 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt
@@ -19,7 +19,7 @@
                     <p>You are not authorized to view this record.</p>
                     [% IF ( OpacSuppressionMessage ) %]
                         <div id="opacsuppressionmessage">
-                            [% OpacSuppressionMessage %]
+                            [% OpacSuppressionMessage.raw %]
                         </div>
                     [% END %]
                 </div>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
index 798c90e9da..c7dec28fc6 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
@@ -65,7 +65,7 @@
             </div>
         [% END %]
 
-        [% IF ( OpacMainUserBlock ) %]<div id="opacmainuserblock">[% OpacMainUserBlock %]</div>[% END %]
+        [% IF ( OpacMainUserBlock ) %]<div id="opacmainuserblock">[% OpacMainUserBlock.raw %]</div>[% END %]
         </div> <!-- / .span 7/9 -->
 
         [% IF ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) || OpacNavRight ) %]
@@ -92,7 +92,7 @@
                                 [% END %]
                                 [% IF Koha.Preference( 'NoLoginInstructions' ) %]
                                     <div id="nologininstructions-main">
-                                        [% Koha.Preference( 'NoLoginInstructions' ) %]
+                                        [% Koha.Preference( 'NoLoginInstructions' ).raw %]
                                     </div>
                                 [% END %]
                                 </form>
@@ -105,7 +105,7 @@
                 [% END # /opacuserlogin %]
                 [% IF ( OpacNavRight ) %]
                     <div id="opacnavright">
-                        [% OpacNavRight %]
+                        [% OpacNavRight.raw %]
                     </div>
                 [% END # /OpacNavRight %]
             </div> <!-- / .span3 -->
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
index af06cc33ea..74e212f1ae 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
@@ -151,7 +151,7 @@
                                                     [% END %]
                                                 </td>
                                                 [% IF OPACMySummaryHTML %]
-                                                    <td>[% issue.MySummaryHTML %]</td>
+                                                    <td>[% issue.MySummaryHTML.raw %]</td>
                                                 [% END %]
                                                 </tr>
                                             [% END # / FOREACH issue %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt
index eb74172dc4..27ccf27ba8 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt
@@ -52,7 +52,7 @@
 
                         <p id="patron-instructions">For your convenience, the login box on this page has been pre-filled with this data. Please log in[% IF OpacPasswordChange %] and change your password[% END %].</p>
 
-                        <div id="PatronSelfRegistrationAdditionalInstructions">[% PatronSelfRegistrationAdditionalInstructions %]</div>
+                        <div id="PatronSelfRegistrationAdditionalInstructions">[% PatronSelfRegistrationAdditionalInstructions.raw %]</div>
                     </div>
 
                 </div> <!-- / .span7/9 -->
@@ -84,7 +84,7 @@
                             [% END # /opacuserlogin %]
                             [% IF ( OpacNavRight ) %]
                                 <div id="opacnavright">
-                                    [% OpacNavRight %]
+                                    [% OpacNavRight.raw %]
                                 </div>
                             [% END # /OpacNavRight %]
                         </div> <!-- / .span3 -->
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt
index fbb63a29ca..4b84ba38f7 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt
@@ -38,7 +38,7 @@
                     [% IF Koha.Preference('RestrictedPageTitle') %]
                         <h1>[% Koha.Preference('RestrictedPageTitle') %]</h1>
                     [% END %]
-                    [% Koha.Preference('RestrictedPageContent') %]
+                    [% Koha.Preference('RestrictedPageContent').raw %]
                 </div>
             </div> <!-- / .span10 -->
         </div> <!-- / .row-fluid -->
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
index 9f5019cd36..d2bbb6012c 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
@@ -53,7 +53,7 @@
                         [% END %]
                         [% IF ( OPACNoResultsFound ) %]
                             <div id="noresultsfound">
-                                [% OPACNoResultsFound %]
+                                [% OPACNoResultsFound.raw %]
                             </div>
                         [% END %]
                     </div> <!-- / .span12 -->
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
index 351a2653d1..4dab3ed58d 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -104,8 +104,7 @@
                         </div>
                     [% END # / IF patron_flagged %]
 
-                    [% SET OPACMySummaryNote = Koha.Preference('OPACMySummaryNote') %]
-                    [% IF OPACMySummaryNote %][% OPACMySummaryNote %][% END %]
+                    [% IF OPACMySummaryNote %][% Koha.Preference('OPACMySummaryNote').raw %][% END %]
 
                     <div id="opac-user-views" class="toptabs">
                         <ul>
@@ -261,7 +260,7 @@
                                                     </td>
                                                 [% END %]
                                                 [% IF ( OPACMySummaryHTML ) %]
-                                                    <td class="links">[% ISSUE.MySummaryHTML %]</td>
+                                                    <td class="links">[% ISSUE.MySummaryHTML.raw %]</td>
                                                 [% END %]
                                             </tr>
                                         [% END # /FOREACH ISSUES %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt
index 0a42ee3fb3..c41e6dcc31 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt
@@ -8,7 +8,7 @@
 <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/jquery/jquery-ui.css" />
 <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/sco.css" />
 [% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS.raw %]</style>[% END %]
-[% IF ( SCOUserCSS ) %]<style type="text/css">[% SCOUserCSS %]</style>[% END %]
+[% IF ( SCOUserCSS ) %]<style type="text/css">[% SCOUserCSS.raw %]</style>[% END %]
 <!--[if lt IE 9]>
     <script src="[% interface %]/[% theme %]/lib/respond.min.js"></script>
 <![endif]-->
@@ -28,7 +28,7 @@
 
 [% IF ( SelfCheckHelpMessage ) %]
 <div id="selfcheckhelpmessage">
-[% SelfCheckHelpMessage %]
+[% SelfCheckHelpMessage.raw %]
 </div>
 [% END %]
 
@@ -61,5 +61,5 @@ The Submit button only needs to be clicked if you enter the barcode manually.</p
 
 [% INCLUDE 'opac-bottom.inc' %]
 [% BLOCK jsinclude %]
-[% IF ( SCOUserJS ) %]<script type="text/javascript">[% SCOUserJS %]</script>[% END %]
+[% IF ( SCOUserJS ) %]<script type="text/javascript">[% SCOUserJS.raw %]</script>[% END %]
 [% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
index 1a494dcd50..65e133669f 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
@@ -9,7 +9,7 @@
 <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/jquery/jquery-ui.css" />
 <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/sco.css" />
 [% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS.raw %]</style>[% END %]
-[% IF ( SCOUserCSS ) %]<style type="text/css">[% SCOUserCSS %]</style>[% END %]
+[% IF ( SCOUserCSS ) %]<style type="text/css">[% SCOUserCSS.raw %]</style>[% END %]
 <!--[if lt IE 9]>
     <script src="[% interface %]/[% theme %]/lib/respond.min.js"></script>
 <![endif]-->
@@ -381,5 +381,5 @@
     //]]>
     </script>
 
-    [% IF ( SCOUserJS ) %]<script type="text/javascript">[% SCOUserJS %]</script>[% END %]
+    [% IF ( SCOUserJS ) %]<script type="text/javascript">[% SCOUserJS.raw %]</script>[% END %]
 [% END %]