diff --git a/template/yoga/menubar.tpl b/template/yoga/menubar.tpl
index 97857d4f0..99cac9b6d 100644
--- a/template/yoga/menubar.tpl
+++ b/template/yoga/menubar.tpl
@@ -6,7 +6,7 @@
 		{if not empty($block->template)}
 		{include file=$block->template|@get_extent:$id }
 		{else}
-		{$block->raw_content|@default}
+		{$block->raw_content}
 		{/if}
 	</dl>
 	{/if}
diff --git a/template/yoga/menubar_links.tpl b/template/yoga/menubar_links.tpl
index eaef54afe..9f521f6b1 100644
--- a/template/yoga/menubar_links.tpl
+++ b/template/yoga/menubar_links.tpl
@@ -4,7 +4,7 @@
 		{foreach from=$block->data item=link}
 			<li>
 				<a href="{$link.URL}"
-					{if isset($link.new_window) }onclick="window.open(this.href, '{$link.new_window.NAME|@escape:'javascript'}','{$link.new_window.FEATURES|@escape:'javascript'}'); return false;"{/if}
+					{if isset($link.new_window) }onclick="window.open(this.href, '{$link.new_window.NAME}','{$link.new_window.FEATURES}'); return false;"{/if}
 				>
 				{$link.LABEL}
 				</a>
diff --git a/template/yoga/thumbnails.tpl b/template/yoga/thumbnails.tpl
index 66829ecec..80f9d7472 100644
--- a/template/yoga/thumbnails.tpl
+++ b/template/yoga/thumbnails.tpl
@@ -11,7 +11,7 @@
 		</a>
 		</span>
 		<span class="thumbLegend">
-		{$thumbnail.NAME|@default}
+		{if isset($thumbnail.NAME)}{$thumbnail.NAME}{/if}
 		{$thumbnail.ICON_TS}
 		{if isset($thumbnail.NB_COMMENTS)}
 		<span class="{if 0==$thumbnail.NB_COMMENTS}zero {/if}nb-comments">