diff --git a/fields/image_mega/tpl/field-doc.tpl b/fields/image_mega/tpl/field-doc.tpl
index da7baa7..91f817a 100644
--- a/fields/image_mega/tpl/field-doc.tpl
+++ b/fields/image_mega/tpl/field-doc.tpl
@@ -34,7 +34,7 @@ $image.http						Есть ли в ссылке http или https (true/false)
 		{/if}
 	{/if}
 		<img src="{$image.url}" alt="{if isset($image.title) && $image.title != ''}{$image.title}{/if}" title="{if isset($image.title) && $image.title != ''}{$image.title}{/if}">
-	{if isset($image.link)}
+	{if isset($image.link) && $image.link != ''}
 		</a>
 	{/if}
 	{if isset($image.description) && $image.description != ''}
diff --git a/fields/image_mega/tpl/field-req.tpl b/fields/image_mega/tpl/field-req.tpl
index cc5c33f..1fd424d 100644
--- a/fields/image_mega/tpl/field-req.tpl
+++ b/fields/image_mega/tpl/field-req.tpl
@@ -34,12 +34,12 @@ $image.http						Есть ли в ссылке http или https (true/false)
 		{/if}
 	{/if}
 		<img src="{$image.url}" alt="{if isset($image.title) && $image.title != ''}{$image.title}{/if}" title="{if isset($image.title) && $image.title != ''}{$image.title}{/if}">
-	{if isset($image.link)}
+	{if isset($image.link) && $image.link != ''}
 		</a>
 	{/if}
 	{if isset($image.description) && $image.description != ''}
 		<p>
-			{$image.description}
+			{$image.description|html_entity_decode}
 		</p>
 	{/if}
 	</div>