diff --git a/classes/Meta.php b/classes/Meta.php
index 631b71478..925321a8b 100644
--- a/classes/Meta.php
+++ b/classes/Meta.php
@@ -126,7 +126,7 @@ class MetaCore extends ObjectModel
 		$sql = 'SELECT *
 				FROM '._DB_PREFIX_.'meta m
 				LEFT JOIN '._DB_PREFIX_.'meta_lang ml on (m.id_meta = ml.id_meta)
-				WHERE (m.page = \''.pSQL($page).'\' OR m.page=\''.str_replace('-', '', strtolower($page)).'\')
+				WHERE (m.page = \''.pSQL($page).'\' OR m.page=\''.pSQL(str_replace('-', '', strtolower($page))).'\')
 					AND ml.id_lang = '.(int)$id_lang
 					.Shop::addSqlRestrictionOnLang('ml');
 		return Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow($sql);
diff --git a/modules/blockcart/blockcart.tpl b/modules/blockcart/blockcart.tpl
index cfe1f7ee5..77b047bce 100644
--- a/modules/blockcart/blockcart.tpl
+++ b/modules/blockcart/blockcart.tpl
@@ -37,7 +37,7 @@ var customizationIdMessage = '{l s='Customization #' mod='blockcart' js=1}';
 var removingLinkText = '{l s='remove this product from my cart' mod='blockcart' js=1}';
 var freeShippingTranslation = '{l s='Free shipping!' mod='blockcart' js=1}';
 var freeProductTranslation = '{l s='Free!' mod='blockcart' js=1}';
-var delete_txt = '{l s='Delete' mod='blockcart'}';
+var delete_txt = '{l s='Delete' mod='blockcart' js=1}';
 </script>
 
 
diff --git a/modules/blocknewsletter/views/templates/hook/blocknewsletter.tpl b/modules/blocknewsletter/views/templates/hook/blocknewsletter.tpl
index 42334d258..dae50de6b 100644
--- a/modules/blocknewsletter/views/templates/hook/blocknewsletter.tpl
+++ b/modules/blocknewsletter/views/templates/hook/blocknewsletter.tpl
@@ -36,8 +36,8 @@
 				{* @todo use jquery (focusin, focusout) instead of onblur and onfocus *}
 				<input type="text" name="email" size="18" 
 					value="{if isset($value) && $value}{$value}{else}{l s='your e-mail' mod='blocknewsletter'}{/if}" 
-					onfocus="javascript:if(this.value=='{l s='your e-mail' mod='blocknewsletter'}')this.value='';" 
-					onblur="javascript:if(this.value=='')this.value='{l s='your e-mail' mod='blocknewsletter'}';" 
+					onfocus="javascript:if(this.value=='{l s='your e-mail' mod='blocknewsletter' js=1}')this.value='';" 
+					onblur="javascript:if(this.value=='')this.value='{l s='your e-mail' mod='blocknewsletter' js=1}';" 
 					class="inputNew" />
 				<!--<select name="action">
 					<option value="0"{if isset($action) && $action == 0} selected="selected"{/if}>{l s='Subscribe' mod='blocknewsletter'}</option>
diff --git a/modules/blockpermanentlinks/blockpermanentlinks-footer.tpl b/modules/blockpermanentlinks/blockpermanentlinks-footer.tpl
index 4f9ba9d88..3ba0b9728 100755
--- a/modules/blockpermanentlinks/blockpermanentlinks-footer.tpl
+++ b/modules/blockpermanentlinks/blockpermanentlinks-footer.tpl
@@ -38,7 +38,7 @@
 	<!-- Bookmark -->
 	<div class="add_bookmark">
 		<script type="text/javascript">
-		writeBookmarkLink('{$come_from}', '{$shop_name|addslashes|addslashes}', '{l s='bookmark this page' mod='blockpermanentlinks'}', '{$img_dir}icon/star.gif');</script>&nbsp;
+		writeBookmarkLink('{$come_from}', '{$shop_name|addslashes|addslashes}', '{l s='bookmark this page' mod='blockpermanentlinks' js=1}', '{$img_dir}icon/star.gif');</script>&nbsp;
 	</div>
 </div>
 <!-- /Block permanent links module -->
diff --git a/modules/blockpermanentlinks/blockpermanentlinks-header.tpl b/modules/blockpermanentlinks/blockpermanentlinks-header.tpl
index 36067a41a..0083786d1 100644
--- a/modules/blockpermanentlinks/blockpermanentlinks-header.tpl
+++ b/modules/blockpermanentlinks/blockpermanentlinks-header.tpl
@@ -28,7 +28,7 @@
 	<li id="header_link_contact"><a href="{$link->getPageLink('contact', true)}" title="{l s='contact' mod='blockpermanentlinks'}">{l s='contact' mod='blockpermanentlinks'}</a></li>
 	<li id="header_link_sitemap"><a href="{$link->getPageLink('sitemap')}" title="{l s='sitemap' mod='blockpermanentlinks'}">{l s='sitemap' mod='blockpermanentlinks'}</a></li>
 	<li id="header_link_bookmark">
-		<script type="text/javascript">writeBookmarkLink('{$come_from}', '{$meta_title|addslashes|addslashes}', '{l s='bookmark' mod='blockpermanentlinks'}');</script>
+		<script type="text/javascript">writeBookmarkLink('{$come_from}', '{$meta_title|addslashes|addslashes}', '{l s='bookmark' mod='blockpermanentlinks' js=1}');</script>
 	</li>
 </ul>
 <!-- /Block permanent links module HEADER -->
diff --git a/modules/blockpermanentlinks/blockpermanentlinks.tpl b/modules/blockpermanentlinks/blockpermanentlinks.tpl
index 2f2a9f412..a7a18e71b 100644
--- a/modules/blockpermanentlinks/blockpermanentlinks.tpl
+++ b/modules/blockpermanentlinks/blockpermanentlinks.tpl
@@ -36,7 +36,7 @@
 	<!-- Bookmark -->
 	<div class="add_bookmark" style="height:30px;">
 		<script type="text/javascript">
-		writeBookmarkLink('{$come_from}', '{$shop_name|addslashes|addslashes}', '{l s='bookmark this page' mod='blockpermanentlinks'}');</script>&nbsp;
+		writeBookmarkLink('{$come_from}', '{$shop_name|addslashes|addslashes}', '{l s='bookmark this page' mod='blockpermanentlinks' js=1}');</script>&nbsp;
 	</div>
 </div>
 <!-- /Block permanent links module -->
\ No newline at end of file
diff --git a/modules/blockwishlist/views/templates/front/mywishlist.tpl b/modules/blockwishlist/views/templates/front/mywishlist.tpl
index ba33562cb..3f0a5e796 100644
--- a/modules/blockwishlist/views/templates/front/mywishlist.tpl
+++ b/modules/blockwishlist/views/templates/front/mywishlist.tpl
@@ -81,7 +81,7 @@
 						<td>{$wishlists[i].date_add|date_format:"%Y-%m-%d"}</td>
 						<td><a href="javascript:;" onclick="javascript:WishlistManage('block-order-detail', '{$wishlists[i].id_wishlist|intval}');">{l s='View' mod='blockwishlist'}</a></td>
 						<td class="wishlist_delete">
-							<a href="javascript:;"onclick="return (WishlistDelete('wishlist_{$wishlists[i].id_wishlist|intval}', '{$wishlists[i].id_wishlist|intval}', '{l s='Do you really want to delete this wishlist ?' mod='blockwishlist'}'));">{l s='Delete' mod='blockwishlist'}</a>
+							<a href="javascript:;"onclick="return (WishlistDelete('wishlist_{$wishlists[i].id_wishlist|intval}', '{$wishlists[i].id_wishlist|intval}', '{l s='Do you really want to delete this wishlist ?' mod='blockwishlist' js=1}'));">{l s='Delete' mod='blockwishlist'}</a>
 						</td>
 					</tr>
 				{/section}
diff --git a/modules/producttooltip/producttooltip.tpl b/modules/producttooltip/producttooltip.tpl
index fd06e74c8..c7893e978 100644
--- a/modules/producttooltip/producttooltip.tpl
+++ b/modules/producttooltip/producttooltip.tpl
@@ -25,8 +25,8 @@
 
 <script type="text/javascript">
 $(document).ready(function() {ldelim}
-	{if isset($nb_people)}$.jGrowl('{if $nb_people == 1}{l s='%d person is currently watching this product' sprintf=$nb_people mod='producttooltip'}{else}{l s='%d people are currently watching this product' sprintf=$nb_people mod='producttooltip'}{/if}', {literal}{ life: 3500 }{/literal});{/if}
-	{if isset($date_last_order)}$.jGrowl('{l s='This product was bought last' mod='producttooltip'} {dateFormat date=$date_last_order full=1}', {literal}{ life: 3500 }{/literal});{/if}
-	{if isset($date_last_cart)}$.jGrowl('{l s='This product was added to cart last' mod='producttooltip'} {dateFormat date=$date_last_cart full=1}', {literal}{ life: 3500 }{/literal});{/if}
+	{if isset($nb_people)}$.jGrowl('{if $nb_people == 1}{l s='%d person is currently watching this product' sprintf=$nb_people mod='producttooltip' js=1}{else}{l s='%d people are currently watching this product' sprintf=$nb_people mod='producttooltip' js=1}{/if}', {literal}{ life: 3500 }{/literal});{/if}
+	{if isset($date_last_order)}$.jGrowl('{l s='This product was bought last' mod='producttooltip' js=1} {dateFormat date=$date_last_order full=1}', {literal}{ life: 3500 }{/literal});{/if}
+	{if isset($date_last_cart)}$.jGrowl('{l s='This product was added to cart last' mod='producttooltip' js=1} {dateFormat date=$date_last_cart full=1}', {literal}{ life: 3500 }{/literal});{/if}
 {rdelim});
 </script>
diff --git a/themes/default/addresses.tpl b/themes/default/addresses.tpl
index 816012b19..27ddf7664 100644
--- a/themes/default/addresses.tpl
+++ b/themes/default/addresses.tpl
@@ -112,7 +112,7 @@
 				</li>
 			{/foreach}
 			<li class="address_update"><a href="{$link->getPageLink('address', true, null, "id_address={$address.object.id|intval}")}" title="{l s='Update'}">&raquo; {l s='Update'}</a></li>
-			<li class="address_delete"><a href="{$link->getPageLink('address', true, null, "id_address={$address.object.id|intval}&delete")}" onclick="return confirm('{l s='Are you sure?'}');" title="{l s='Delete'}">&raquo; {l s='Delete'}</a></li>
+			<li class="address_delete"><a href="{$link->getPageLink('address', true, null, "id_address={$address.object.id|intval}&delete")}" onclick="return confirm('{l s='Are you sure?' js=1}');" title="{l s='Delete'}">&raquo; {l s='Delete'}</a></li>
 		</ul>
 	{/foreach}
 	</div>
@@ -127,4 +127,4 @@
 <ul class="footer_links">
 	<li><a href="{$link->getPageLink('my-account', true)}"><img src="{$img_dir}icon/my-account.gif" alt="" class="icon" /> {l s='Back to your account'}</a></li>
 	<li class="f_right"><a href="{$base_dir}"><img src="{$img_dir}icon/home.gif" alt="" class="icon" /> {l s='Home'}</a></li>
-</ul>
\ No newline at end of file
+</ul>
diff --git a/themes/live_edit.tpl b/themes/live_edit.tpl
index a0f0c2f9f..77b385e84 100644
--- a/themes/live_edit.tpl
+++ b/themes/live_edit.tpl
@@ -27,7 +27,7 @@
 		var ad = "{$smarty.get.ad}";
 	{/if}
 	var lastMove = '';
-	var saveOK = '{l s='Module position saved'}';
+	var saveOK = '{l s='Module position saved' js=1}';
 	var confirmClose = '{l s='Are you sure? If you close this window, its position won\'t be saved'  js=1}';
 	var close = '{l s='Close' js=1}';
 	var cancel = '{l s='Cancel' js=1}';