diff --git a/templates/backOffice/default/search.html b/templates/backOffice/default/search.html
index a3af85dac..7e16e08e7 100644
--- a/templates/backOffice/default/search.html
+++ b/templates/backOffice/default/search.html
@@ -13,7 +13,7 @@
         <div class="clearfix">
             <ul class="breadcrumb pull-left">
                 <li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
-                <li><a href="#">{intl l="Search for '%term'" term=trim($smarty.get.search_term)}</a></li>
+                <li><a href="#">{intl l="Search for '%term'" term=trim({$smarty.get.search_term})}</a></li>
             </ul>
         </div>
 
diff --git a/templates/frontOffice/default/account.html b/templates/frontOffice/default/account.html
index 83e2b5a8e..f4eb8136d 100644
--- a/templates/frontOffice/default/account.html
+++ b/templates/frontOffice/default/account.html
@@ -38,15 +38,15 @@
                             <ul class="list-info">
                                 <li>
                                     <address class="adr">
-                                        <span class="street-address">{$ADDRESS1 nofilter}</span><br>
+                                        <span class="street-address">{$ADDRESS1}</span><br>
                                         {if $ADDRESS2 != ""}
-                                            <span class="extended-address">{$ADDRESS2 nofilter}</span><br>
+                                            <span class="extended-address">{$ADDRESS2}</span><br>
                                         {/if}
                                         {if $ADDRESS3 != ""}
-                                            <span class="extended-address">{$ADDRESS3 nofilter}</span><br>
+                                            <span class="extended-address">{$ADDRESS3}</span><br>
                                         {/if}
                                         <span class="postal-code">{$ZIPCODE}</span>
-                                        <span class="locality">{$CITY nofilter}<br><span class="country-name">{loop type="country" name="customer.country.info" id=$COUNTRY}{$TITLE}{/loop}</span></span>
+                                        <span class="locality">{$CITY}<br><span class="country-name">{loop type="country" name="customer.country.info" id=$COUNTRY}{$TITLE}{/loop}</span></span>
                                     </address>
                                 </li>
                                 <li>
@@ -94,15 +94,15 @@
                                             </li>
                                             <li>
                                                 <address class="adr">
-                                                    <span class="street-address">{$ADDRESS1 nofilter}</span><br>
+                                                    <span class="street-address">{$ADDRESS1}</span><br>
                                                     {if $ADDRESS2 != ""}
-                                                        <span class="street-address">{$ADDRESS2 nofilter}</span><br>
+                                                        <span class="street-address">{$ADDRESS2}</span><br>
                                                     {/if}
                                                     {if $ADDRESS3 != ""}
-                                                        <span class="street-address">{$ADDRESS3 nofilter}</span><br>
+                                                        <span class="street-address">{$ADDRESS3}</span><br>
                                                     {/if}
                                                     <span class="postal-code">{$ZIPCODE}</span>
-                                                    <span class="locality">{$CITY nofilter}, <span class="country-name">{loop type="country" name="customer.country.info" id=$COUNTRY}{$TITLE}{/loop}</span></span>
+                                                    <span class="locality">{$CITY}, <span class="country-name">{loop type="country" name="customer.country.info" id=$COUNTRY}{$TITLE}{/loop}</span></span>
                                                 </address>
                                             </li>
                                             <li>