diff --git a/templates/NOVA/account/my_account.tpl b/templates/NOVA/account/my_account.tpl
index 91442fd..36cf223 100644
--- a/templates/NOVA/account/my_account.tpl
+++ b/templates/NOVA/account/my_account.tpl
@@ -149,14 +149,17 @@
                                                     {block name='account-my-account-shipping-address-name'}
                                                         <td>
-                                                            {$lieferadresse->cStrasse} {$lieferadresse->cHausnummer},
-                                                            {$lieferadresse->cPLZ}
-                                                            {$lieferadresse->cOrt}, {$lieferadresse->cLand}
+                                                            {$lieferadresse->cStrasse|escape:'html':'UTF-8':false}
+                                                            {$lieferadresse->cHausnummer|escape:'html':'UTF-8':false},
+                                                            {$lieferadresse->cPLZ|escape:'html':'UTF-8':false}
+                                                            {$lieferadresse->cOrt|escape:'html':'UTF-8':false},
+                                                            {$lieferadresse->cLand|escape:'html':'UTF-8':false}
                                                             <small class="text-muted-util d-block">
                                                                 {if $lieferadresse->cFirma}
                                                                     <span class="font-weight-bold">
-                                                                        {$lieferadresse->cFirma}
+                                                                        {$lieferadresse->cFirma|escape:'html':'UTF-8':false}
                                                                     </span>
                                                                 {/if}
-                                                                {$lieferadresse->cVorname} {$lieferadresse->cNachname}
+                                                                {$lieferadresse->cVorname|escape:'html':'UTF-8':false}
+                                                                {$lieferadresse->cNachname|escape:'html':'UTF-8':false}
                                                             </small>
                                                         </td>
diff --git a/templates/NOVA/account/shipping_address_form.tpl b/templates/NOVA/account/shipping_address_form.tpl
index f152f05..2417f10 100644
--- a/templates/NOVA/account/shipping_address_form.tpl
+++ b/templates/NOVA/account/shipping_address_form.tpl
@@ -66,8 +66,8 @@
                                     <tr>
                                         <td>
-                                            {if $address->cFirma}{$address->cFirma}<br />{/if}
-                                            <strong>{if $address->cTitel}{$address->cTitel}{/if} {$address->cVorname} {$address->cNachname}</strong><br />
-                                            {$address->cStrasse} {$address->cHausnummer}<br />
-                                            {$address->cPLZ} {$address->cOrt}<br />
+                                            {if $address->cFirma}{$address->cFirma|escape:'html':'UTF-8':false}<br />{/if}
+                                            <strong>{if $address->cTitel}{$address->cTitel|escape:'html':'UTF-8':false}{/if} {$address->cVorname|escape:'html':'UTF-8':false} {$address->cNachname|escape:'html':'UTF-8':false}</strong><br />
+                                            {$address->cStrasse|escape:'html':'UTF-8':false} {$address->cHausnummer|escape:'html':'UTF-8':false}<br />
+                                            {$address->cPLZ|escape:'html':'UTF-8':false} {$address->cOrt|escape:'html':'UTF-8':false}<br />
                                             <div id="deliveryAdditional{$address->kLieferadresse}" class="collapse">
                                                 {block name='account-shipping-address-include-inc-delivery-address'}
diff --git a/templates/NOVA/checkout/customer_shipping_address.tpl b/templates/NOVA/checkout/customer_shipping_address.tpl
index 5b5a030..8bef5ce 100644
--- a/templates/NOVA/checkout/customer_shipping_address.tpl
+++ b/templates/NOVA/checkout/customer_shipping_address.tpl
@@ -33,5 +33,5 @@
                             options=[
                                 "text", "{$prefix}-{$name}-title", "{$prefix}[{$name}][titel]",
-                                {$Lieferadresse->cTitel|default:null},
+                                {$Lieferadresse->cTitel|default:null|escape:'html':'UTF-8':false},
                                 {lang key='title' section='account data'}, {$Einstellungen.kunden.lieferadresse_abfragen_titel},
                                 null, "shipping honorific-prefix", null, 64
@@ -51,5 +51,5 @@
                         options=[
                             "text", "{$prefix}-{$name}-firstName", "{$prefix}[{$name}][vorname]",
-                            {$Lieferadresse->cVorname|default:null}, {lang key='firstName' section='account data'},
+                            {$Lieferadresse->cVorname|default:null|escape:'html':'UTF-8':false}, {lang key='firstName' section='account data'},
                             {$Einstellungen.kunden.kundenregistrierung_pflicht_vorname},
                             null, "shipping given-name"
@@ -63,5 +63,5 @@
                         options=[
                             "text", "{$prefix}-{$name}-lastName", "{$prefix}[{$name}][nachname]",
-                            {$Lieferadresse->cNachname|default:null}, {lang key='lastName' section='account data'},
+                            {$Lieferadresse->cNachname|default:null|escape:'html':'UTF-8':false}, {lang key='lastName' section='account data'},
                             true, null, "shipping family-name"
                         ]
@@ -80,5 +80,5 @@
                             options=[
                                 "text", "{$prefix}-{$name}-firm", "{$prefix}[{$name}][firma]",
-                                {$Lieferadresse->cFirma|default:null}, {lang key='firm' section='account data'},
+                                {$Lieferadresse->cFirma|default:null|escape:'html':'UTF-8':false}, {lang key='firm' section='account data'},
                                 $Einstellungen.kunden.lieferadresse_abfragen_firma, null, "shipping organization",
                                 null, 128
@@ -94,5 +94,5 @@
                             options=[
                                 "text", "{$prefix}-{$name}-firmext", "{$prefix}[{$name}][firmazusatz]",
-                                {$Lieferadresse->cZusatz|default:null}, {lang key='firmext' section='account data'},
+                                {$Lieferadresse->cZusatz|default:null|escape:'html':'UTF-8':false}, {lang key='firmext' section='account data'},
                                 $Einstellungen.kunden.lieferadresse_abfragen_firmazusatz, null, "shipping organization ext",
                                 null, 60
@@ -112,5 +112,5 @@
                         options=[
                             "text", "{$prefix}-{$name}-street", "{$prefix}[{$name}][strasse]",
-                            {$Lieferadresse->cStrasse|default:null}, {lang key='street' section='account data'},
+                            {$Lieferadresse->cStrasse|default:null|escape:'html':'UTF-8':false}, {lang key='street' section='account data'},
                             true, null, "shipping address-line1"
                         ]
@@ -123,5 +123,5 @@
                         options=[
                             "text", "{$prefix}-{$name}-streetnumber", "{$prefix}[{$name}][hausnummer]",
-                            {$Lieferadresse->cHausnummer|default:null}, {lang key='streetnumber' section='account data'},
+                            {$Lieferadresse->cHausnummer|default:null|escape:'html':'UTF-8':false}, {lang key='streetnumber' section='account data'},
                             true, null, "shipping address-line2"
                         ]
@@ -140,5 +140,5 @@
                             options=[
                                 "text", "{$prefix}-{$name}-street2", "{$prefix}[{$name}][adresszusatz]",
-                                {$Lieferadresse->cAdressZusatz|default:null}, {lang key='street2' section='account data'},
+                                {$Lieferadresse->cAdressZusatz|default:null|escape:'html':'UTF-8':false}, {lang key='street2' section='account data'},
                                 $Einstellungen.kunden.lieferadresse_abfragen_adresszusatz, null, "shipping address-line3"
                             ]
@@ -212,5 +212,5 @@
                                     type="text"
                                     name="{$prefix}[{$name}][bundesland]"
-                                    value="{if isset($Lieferadresse->cBundesland)}{$Lieferadresse->cBundesland}{/if}"
+                                    value="{if isset($Lieferadresse->cBundesland)}{$Lieferadresse->cBundesland|escape:'html':'UTF-8':false}{/if}"
                                     id="{$prefix}-{$name}-state"
                                     data=[
@@ -254,5 +254,5 @@
                             type="text"
                             name="{$prefix}[{$name}][plz]"
-                            value="{if isset($Lieferadresse->cPLZ)}{$Lieferadresse->cPLZ}{/if}"
+                            value="{if isset($Lieferadresse->cPLZ)}{$Lieferadresse->cPLZ|escape:'html':'UTF-8':false}{/if}"
                             id="{$prefix}-{$name}-postcode"
                             class="postcode_input typeahead bg-typeahead-fix"
@@ -283,5 +283,5 @@
                         {input type="text"
                             name="{$prefix}[{$name}][ort]"
-                            value="{if isset($Lieferadresse->cOrt)}{$Lieferadresse->cOrt}{/if}"
+                            value="{if isset($Lieferadresse->cOrt)}{$Lieferadresse->cOrt|escape:'html':'UTF-8':false}{/if}"
                             id="{$prefix}-{$name}-city"
                             class="city_input typeahead bg-typeahead-fix"
diff --git a/templates/NOVA/checkout/customer_shipping_contact.tpl b/templates/NOVA/checkout/customer_shipping_contact.tpl
index fe5b9ed..056616a 100644
--- a/templates/NOVA/checkout/customer_shipping_contact.tpl
+++ b/templates/NOVA/checkout/customer_shipping_contact.tpl
@@ -26,5 +26,6 @@
                                     options=[
                                         "email", "{$prefix}-{$name}-email", "{$prefix}[{$name}][email]",
-                                        {$Lieferadresse->cMail|default:null}, {lang key='email' section='account data'},
+                                        {$Lieferadresse->cMail|default:null|escape:'html':'UTF-8':false},
+                                        {lang key='email' section='account data'},
                                         $Einstellungen.kunden.lieferadresse_abfragen_email, null, "shipping email"
                                     ]
@@ -39,5 +40,6 @@
                                         options=[
                                             "tel", "{$prefix}-{$name}-mobil", "{$prefix}[{$name}][mobil]",
-                                            {$Lieferadresse->cMobil|default:null}, {lang key='mobile' section='account data'},
+                                            {$Lieferadresse->cMobil|default:null|escape:'html':'UTF-8':false},
+                                            {lang key='mobile' section='account data'},
                                             $Einstellungen.kunden.lieferadresse_abfragen_mobil, null,
                                             "shipping mobile tel", null, 30
@@ -57,5 +59,6 @@
                                         options=[
                                             "tel", "{$prefix}-{$name}-tel", "{$prefix}[{$name}][tel]",
-                                            {$Lieferadresse->cTel|default:null}, {lang key='tel' section='account data'},
+                                            {$Lieferadresse->cTel|default:null|escape:'html':'UTF-8':false},
+                                            {lang key='tel' section='account data'},
                                             $Einstellungen.kunden.lieferadresse_abfragen_tel, null, "shipping home tel",
                                             null, 45
@@ -71,5 +74,6 @@
                                         options=[
                                             "tel", "{$prefix}-{$name}-fax", "{$prefix}[{$name}][fax]",
-                                            {$Lieferadresse->cFax|default:null}, {lang key='fax' section='account data'},
+                                            {$Lieferadresse->cFax|default:null|escape:'html':'UTF-8':false},
+                                            {lang key='fax' section='account data'},
                                             $Einstellungen.kunden.lieferadresse_abfragen_fax, null, "shipping fax tel",
                                             null, 45
diff --git a/templates/NOVA/checkout/inc_billing_address.tpl b/templates/NOVA/checkout/inc_billing_address.tpl
index d7621f6..2414fd9 100644
--- a/templates/NOVA/checkout/inc_billing_address.tpl
+++ b/templates/NOVA/checkout/inc_billing_address.tpl
@@ -6,26 +6,26 @@
         <ul class="list-unstyled inc-billing-address">
             {if isset($orderDetail)}
-                {if $addressData->cFirma}<li>{$addressData->cFirma}</li>{/if}
-                <li>{$addressData->cTitel} {$addressData->cVorname} {$addressData->cNachname}</li>
+                {if $addressData->cFirma}<li>{$addressData->cFirma|escape:'html':'UTF-8':false}</li>{/if}
+                <li>{$addressData->cTitel|escape:'html':'UTF-8':false} {$addressData->cVorname|escape:'html':'UTF-8':false} {$addressData->cNachname|escape:'html':'UTF-8':false}</li>
                 <li>
-                    {$addressData->cStrasse} {$addressData->cHausnummer} {if $addressData->cAdressZusatz}{$addressData->cAdressZusatz}{/if},
-                    {$addressData->cPLZ} {$addressData->cOrt},
-                    {$addressData->cLand}
+                    {$addressData->cStrasse|escape:'html':'UTF-8':false} {$addressData->cHausnummer|escape:'html':'UTF-8':false} {if $addressData->cAdressZusatz}{$addressData->cAdressZusatz|escape:'html':'UTF-8':false}{/if},
+                    {$addressData->cPLZ|escape:'html':'UTF-8':false} {$addressData->cOrt|escape:'html':'UTF-8':false},
+                    {$addressData->cLand|escape:'html':'UTF-8':false}
                 </li>
             {else}
-                {if $addressData->cFirma}<li>{$addressData->cFirma}</li>{/if}
-                {if $addressData->cZusatz}<li>{$addressData->cZusatz}</li>{/if}
-                <li>{$addressData->cTitel} {$addressData->cVorname} {$addressData->cNachname}</li>
-                <li>{$addressData->cStrasse} {$addressData->cHausnummer}</li>
-                {if $addressData->cAdressZusatz}<li>{$addressData->cAdressZusatz}</li>{/if}
-                <li>{$addressData->cPLZ} {$addressData->cOrt}</li>
-                {if $addressData->cBundesland}<li>{$addressData->cBundesland}</li>{/if}
-                <li>{if $addressData->angezeigtesLand}{$addressData->angezeigtesLand}{else}{$addressData->cLand}{/if}</li>
+                {if $addressData->cFirma}<li>{$addressData->cFirma|escape:'html':'UTF-8':false}</li>{/if}
+                {if $addressData->cZusatz}<li>{$addressData->cZusatz|escape:'html':'UTF-8':false}</li>{/if}
+                <li>{$addressData->cTitel|escape:'html':'UTF-8':false} {$addressData->cVorname|escape:'html':'UTF-8':false} {$addressData->cNachname|escape:'html':'UTF-8':false}</li>
+                <li>{$addressData->cStrasse|escape:'html':'UTF-8':false} {$addressData->cHausnummer|escape:'html':'UTF-8':false}</li>
+                {if $addressData->cAdressZusatz}<li>{$addressData->cAdressZusatz|escape:'html':'UTF-8':false}</li>{/if}
+                <li>{$addressData->cPLZ|escape:'html':'UTF-8':false} {$addressData->cOrt|escape:'html':'UTF-8':false}</li>
+                {if $addressData->cBundesland}<li>{$addressData->cBundesland|escape:'html':'UTF-8':false}</li>{/if}
+                <li>{if $addressData->angezeigtesLand}{$addressData->angezeigtesLand|escape:'html':'UTF-8':false}{else}{$addressData->cLand|escape:'html':'UTF-8':false}{/if}</li>
             {/if}
-            {if $addressData->cUSTID}<li>{lang key='ustid' section='account data'}: {$addressData->cUSTID}</li>{/if}
-            {if $addressData->cTel}<li>{lang key='tel' section='account data'}: {$addressData->cTel}</li>{/if}
-            {if $addressData->cFax}<li>{lang key='fax' section='account data'}: {$addressData->cFax}</li>{/if}
-            {if $addressData->cMobil}<li>{lang key='mobile' section='account data'}: {$addressData->cMobil}</li>{/if}
-            <li>{$addressData->cMail}</li>
+            {if $addressData->cUSTID}<li>{lang key='ustid' section='account data'}: {$addressData->cUSTID|escape:'html':'UTF-8':false}</li>{/if}
+            {if $addressData->cTel}<li>{lang key='tel' section='account data'}: {$addressData->cTel|escape:'html':'UTF-8':false}</li>{/if}
+            {if $addressData->cFax}<li>{lang key='fax' section='account data'}: {$addressData->cFax|escape:'html':'UTF-8':false}</li>{/if}
+            {if $addressData->cMobil}<li>{lang key='mobile' section='account data'}: {$addressData->cMobil|escape:'html':'UTF-8':false}</li>{/if}
+            <li>{$addressData->cMail|escape:'html':'UTF-8':false}</li>
         </ul>
     {/block}
diff --git a/templates/NOVA/checkout/inc_delivery_address.tpl b/templates/NOVA/checkout/inc_delivery_address.tpl
index 47e4c3d..76b54fd 100644
--- a/templates/NOVA/checkout/inc_delivery_address.tpl
+++ b/templates/NOVA/checkout/inc_delivery_address.tpl
@@ -3,30 +3,30 @@
     <ul class="list-unstyled inc-delivery-address">
         {if isset($orderDetail)}
-            {if $Lieferadresse->cFirma}<li>{$Lieferadresse->cFirma}</li>{/if}
-            {if $Lieferadresse->cZusatz}<li>{$Lieferadresse->cZusatz}</li>{/if}
-            <li>{$Lieferadresse->cTitel} {$Lieferadresse->cVorname} {$Lieferadresse->cNachname}</li>
+            {if $Lieferadresse->cFirma}<li>{$Lieferadresse->cFirma|escape:'html':'UTF-8':false}</li>{/if}
+            {if $Lieferadresse->cZusatz}<li>{$Lieferadresse->cZusatz|escape:'html':'UTF-8':false}</li>{/if}
+            <li>{$Lieferadresse->cTitel|escape:'html':'UTF-8':false} {$Lieferadresse->cVorname|escape:'html':'UTF-8':false} {$Lieferadresse->cNachname|escape:'html':'UTF-8':false}</li>
             <li>
-                {$Lieferadresse->cStrasse} {$Lieferadresse->cHausnummer}, {if $Lieferadresse->cAdressZusatz}{$Lieferadresse->cAdressZusatz},{/if}
-                {$Lieferadresse->cPLZ} {$Lieferadresse->cOrt},
-                {if $Lieferadresse->cLand}{$Lieferadresse->cLand}{/if}
+                {$Lieferadresse->cStrasse|escape:'html':'UTF-8':false} {$Lieferadresse->cHausnummer|escape:'html':'UTF-8':false}, {if $Lieferadresse->cAdressZusatz}{$Lieferadresse->cAdressZusatz|escape:'html':'UTF-8':false},{/if}
+                {$Lieferadresse->cPLZ|escape:'html':'UTF-8':false} {$Lieferadresse->cOrt|escape:'html':'UTF-8':false},
+                {if $Lieferadresse->cLand}{$Lieferadresse->cLand|escape:'html':'UTF-8':false}{/if}
             </li>
         {else}
             {if !$hideMainInfo}
-                {if $Lieferadresse->cFirma}<li>{$Lieferadresse->cFirma}</li>{/if}
-                {if $Lieferadresse->cZusatz}<li>{$Lieferadresse->cZusatz}</li>{/if}
-                <li>{$Lieferadresse->cTitel} {$Lieferadresse->cVorname} {$Lieferadresse->cNachname}</li>
-                <li>{$Lieferadresse->cStrasse} {$Lieferadresse->cHausnummer}</li>
+                {if $Lieferadresse->cFirma}<li>{$Lieferadresse->cFirma|escape:'html':'UTF-8':false}</li>{/if}
+                {if $Lieferadresse->cZusatz}<li>{$Lieferadresse->cZusatz|escape:'html':'UTF-8':false}</li>{/if}
+                <li>{$Lieferadresse->cTitel|escape:'html':'UTF-8':false} {$Lieferadresse->cVorname|escape:'html':'UTF-8':false} {$Lieferadresse->cNachname|escape:'html':'UTF-8':false}</li>
+                <li>{$Lieferadresse->cStrasse|escape:'html':'UTF-8':false} {$Lieferadresse->cHausnummer|escape:'html':'UTF-8':false}</li>
             {/if}
-            {if $Lieferadresse->cAdressZusatz}<li>{$Lieferadresse->cAdressZusatz}</li>{/if}
+            {if $Lieferadresse->cAdressZusatz}<li>{$Lieferadresse->cAdressZusatz|escape:'html':'UTF-8':false}</li>{/if}
             {if !$hideMainInfo}
-                <li>{$Lieferadresse->cPLZ} {$Lieferadresse->cOrt}</li>
+                <li>{$Lieferadresse->cPLZ|escape:'html':'UTF-8':false} {$Lieferadresse->cOrt|escape:'html':'UTF-8':false}</li>
             {/if}
-            {if $Lieferadresse->cBundesland}<li>{$Lieferadresse->cBundesland}</li>{/if}
-            {if $Lieferadresse->angezeigtesLand}<li>{$Lieferadresse->angezeigtesLand}</li>{/if}
+            {if $Lieferadresse->cBundesland}<li>{$Lieferadresse->cBundesland|escape:'html':'UTF-8':false}</li>{/if}
+            {if $Lieferadresse->angezeigtesLand}<li>{$Lieferadresse->angezeigtesLand|escape:'html':'UTF-8':false}</li>{/if}
         {/if}
-        {if $Lieferadresse->cTel}<li>{lang key='tel' section='account data'}: {$Lieferadresse->cTel}</li>{/if}
-        {if $Lieferadresse->cFax}<li>{lang key='fax' section='account data'}: {$Lieferadresse->cFax}</li>{/if}
-        {if $Lieferadresse->cMobil}<li>{lang key='mobile' section='account data'}: {$Lieferadresse->cMobil}</li>{/if}
-        {if $Lieferadresse->cMail}<li>{$Lieferadresse->cMail}</li>{/if}
+        {if $Lieferadresse->cTel}<li>{lang key='tel' section='account data'}: {$Lieferadresse->cTel|escape:'html':'UTF-8':false}</li>{/if}
+        {if $Lieferadresse->cFax}<li>{lang key='fax' section='account data'}: {$Lieferadresse->cFax|escape:'html':'UTF-8':false}</li>{/if}
+        {if $Lieferadresse->cMobil}<li>{lang key='mobile' section='account data'}: {$Lieferadresse->cMobil|escape:'html':'UTF-8':false}</li>{/if}
+        {if $Lieferadresse->cMail}<li>{$Lieferadresse->cMail|escape:'html':'UTF-8':false}</li>{/if}
     </ul>
 {/block}
diff --git a/templates/NOVA/checkout/inc_shipping_address.tpl b/templates/NOVA/checkout/inc_shipping_address.tpl
index e0ca71b..6ad2abe 100644
--- a/templates/NOVA/checkout/inc_shipping_address.tpl
+++ b/templates/NOVA/checkout/inc_shipping_address.tpl
@@ -60,8 +60,8 @@
                                     <td>
                                         <div class="dt-address" data-delivery-id="#delivery{$adresse->kLieferadresse}">
-                                            {if $adresse->cFirma}{$adresse->cFirma}<br>{/if}
-                                            <strong>{if $adresse->cTitel}{$adresse->cTitel}{/if} {$adresse->cVorname} {$adresse->cNachname}</strong><br>
-                                            {$adresse->cStrasse} {$adresse->cHausnummer}<br>
-                                            {$adresse->cPLZ} {$adresse->cOrt}<br>
+                                            {if $adresse->cFirma}{$adresse->cFirma|escape:'html':'UTF-8':false}<br>{/if}
+                                            <strong>{if $adresse->cTitel}{$adresse->cTitel|escape:'html':'UTF-8':false}{/if} {$adresse->cVorname|escape:'html':'UTF-8':false} {$adresse->cNachname|escape:'html':'UTF-8':false}</strong><br>
+                                            {$adresse->cStrasse|escape:'html':'UTF-8':false} {$adresse->cHausnummer|escape:'html':'UTF-8':false}<br>
+                                            {$adresse->cPLZ|escape:'html':'UTF-8':false} {$adresse->cOrt|escape:'html':'UTF-8':false}<br>
                                             <div id="deliveryAdditional{$adresse->kLieferadresse}" class="collapse">
                                                 {block name='checkout-inc-shipping-address-include-inc-delivery-address'}
diff --git a/templates/NOVA/checksums.csv b/templates/NOVA/checksums.csv
index b0be03e..2ea4d00 100644
--- a/templates/NOVA/checksums.csv
+++ b/templates/NOVA/checksums.csv
@@ -9,5 +9,5 @@ fb1b27486cc2b1a5408034f924691e63;account/delete_account.tpl
 d55e93313d30866ad760ea27dae8651d;account/index.tpl
 4a1f4e2a19ccd31e6f7720e3c0d5aad9;account/login.tpl
-18ac2cd3c455a8ce27505eebfd7a7fa3;account/my_account.tpl
+eff629f3808f10c84e32bae93bf857d5;account/my_account.tpl
 b645d4e8002239526df4ec44921c746c;account/order_details.tpl
 2e9b97418272cb67743492515fc0d57d;account/order_item.tpl
@@ -21,5 +21,5 @@ d4887299cd5c6ca93f8de4a0014129a9;account/rma_list.tpl
 cf7a4d6e1303d2fe21e45451363bfba7;account/rma_summary.tpl
 2ef321a6a9faec463c647c9ac624b2ee;account/rma_table.tpl
-9f6454743a6f058f1a2196b6dfb2c656;account/shipping_address_form.tpl
+8d8784ca7cc31044b3bfba35269771f7;account/shipping_address_form.tpl
 2d7945ffed6620389c2e758f20aa30d0;account/two_fa.tpl
 6749bb2df120d9463892c14f6b7a01dc;account/uploads.tpl
@@ -66,14 +66,14 @@ efe4062071f23ad1af4bc94fd3e5830c;build-bundles.mjs
 880db192aaf67998c753757062cc3913;checkout/coupon_form.tpl
 e486964a04f18fa4cfa12a98175941c9;checkout/credit_form.tpl
-19a1c9d3f43399bdc922afb62fe6e9d4;checkout/customer_shipping_address.tpl
-e8a4762278d19d591a327c7767a0b139;checkout/customer_shipping_contact.tpl
-06020be8f3f5b7d18222dd8308ef972e;checkout/inc_billing_address.tpl
+3a7a5644a5e79ae36f5b052686eed78f;checkout/customer_shipping_address.tpl
+9649d60b1b75f38b56adb968e136a5c3;checkout/customer_shipping_contact.tpl
+c1e9dc3488bf00995f47d25ae6d053fd;checkout/inc_billing_address.tpl
 80d1972aabaa92b3f405880571dcdb20;checkout/inc_billing_address_form.tpl
-1df1183d3a3950cede5b941ef1a07535;checkout/inc_delivery_address.tpl
+22b67fcc1c87511edbf3f0026371622b;checkout/inc_delivery_address.tpl
 b4a743e82adb300d45bfb81d02a7446a;checkout/inc_order_completed.tpl
 af27b27465422dbdd4691fb7f2e842c1;checkout/inc_order_items.tpl
 7c61a3c6c91284ddc686fdee72fd5070;checkout/inc_payment_methods.tpl
 4c16f2d985bcb18de9da72877ac28eff;checkout/inc_paymentmodules.tpl
-ce8a7ae0581c14c4382ae6fb72b0903f;checkout/inc_shipping_address.tpl
+1cc1102a5734842ba38e248ce415de36;checkout/inc_shipping_address.tpl
 8682daf83627e2530c9bfdfcb0ad1dae;checkout/inc_steps.tpl
 4483e7c18c28ad0eb7a97ed487f91cff;checkout/index.tpl
@@ -308,5 +308,5 @@ bc4a536ba367d80cf1ee310cfc4c5f9b;productdetails/question_on_item.tpl
 5ab01871785c111bfde620b78b952903;productdetails/rating.tpl
 eb64c5d9a3f21c0a151f15ade7df5672;productdetails/review_form.tpl
-27e1ecf07a1302b2b0fd1d90e3516b69;productdetails/review_item.tpl
+151806a5a609441bce3689ebbf8fc706;productdetails/review_item.tpl
 0a3cee38dc92349e1c0c53f738a5d760;productdetails/reviews.tpl
 ecfac4489d5d5f843030707a16baf3b2;productdetails/stock.tpl
diff --git a/templates/NOVA/productdetails/review_item.tpl b/templates/NOVA/productdetails/review_item.tpl
index f8be5b6..2657e4f 100644
--- a/templates/NOVA/productdetails/review_item.tpl
+++ b/templates/NOVA/productdetails/review_item.tpl
@@ -24,5 +24,5 @@
                 {row itemprop="review" itemscope=true itemtype="https://schema.org/Review"}
                     {block name='productdetails-review-item-title'}
-                        <span itemprop="name" class="d-none">{$oBewertung->cTitel}</span>
+                        <span itemprop="name" class="d-none">{$oBewertung->cTitel|escape:'html':'UTF-8':false}</span>
                     {/block}
                     {block name='productdetails-review-item-review'}
@@ -75,9 +75,9 @@
                         {col}
                             <blockquote>
-                                <span class="subheadline">{$oBewertung->cTitel}</span>
-                                <p itemprop="reviewBody">{$oBewertung->cText|nl2br}</p>
+                                <span class="subheadline">{$oBewertung->cTitel|escape:'html':'UTF-8':false}</span>
+                                <p itemprop="reviewBody">{$oBewertung->cText|escape:'html':'UTF-8':false|nl2br}</p>
                                 <div class="blockquote-footer">
                                     <span itemprop="author" itemscope itemtype="https://schema.org/Person">
-                                        <span itemprop="name">{$oBewertung->cName}</span>
+                                        <span itemprop="name">{$oBewertung->cName|escape:'html':'UTF-8':false}</span>
                                     </span>,
                                     <meta itemprop="datePublished" content="{$oBewertung->dDatum}" />{$oBewertung->Datum}