diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl
index 0a9b19aab..70b80d985 100644
--- a/admin/themes/default/template/admin.tpl
+++ b/admin/themes/default/template/admin.tpl
@@ -103,7 +103,7 @@ jQuery(document).ready(function() {
 				<li><a href="{$U_MAINTENANCE}"><i class="icon-tools"></i>{'Maintenance'|@translate}</a></li>
 {if isset($U_COMMENTS)}
 				<li><a href="{$U_COMMENTS}"><i class="icon-chat"></i>{'Comments'|@translate}
-        {if $NB_PENDING_COMMENTS > 0}
+        {if isset($NB_PENDING_COMMENTS) and $NB_PENDING_COMMENTS > 0}
           <span class="adminMenubarCounter" title="{'%d waiting for validation'|translate:$NB_PENDING_COMMENTS}">{$NB_PENDING_COMMENTS}</span>
         {/if}</a></li>
 {/if}
diff --git a/admin/themes/default/template/tags.tpl b/admin/themes/default/template/tags.tpl
index 845d7fb8f..35ffa382a 100644
--- a/admin/themes/default/template/tags.tpl
+++ b/admin/themes/default/template/tags.tpl
@@ -154,6 +154,7 @@ var str_tag_found = '{'<b>%d</b> tag found'|@translate}';
 <div class='tag-container' data-tags='{$data|@json_encode|escape:html}' data-per_page={$per_page}>
   {foreach from=$first_tags item=tag}
   <div class='tag-box' data-id='{$tag.id}' data-selected='0'>
+  {if isset($tag.counter)}
     {tagContent 
         tag_name = $tag.name
         tag_U_VIEW = 'index.php?/tags/%s-%s'|@sprintf:$tag['id']:$tag['url_name']
@@ -161,6 +162,16 @@ var str_tag_found = '{'<b>%d</b> tag found'|@translate}';
         has_image = ($tag.counter > 0)
         tag_count = $tag.counter
       }
+  {else}
+    {tagContent 
+        tag_name = $tag.name
+        tag_U_VIEW = 'index.php?/tags/%s-%s'|@sprintf:$tag['id']:$tag['url_name']
+        tag_U_EDIT = 'admin.php?page=batch_manager&amp;filter=tag-%s'|@sprintf:$tag['id']
+        has_image = false
+        tag_count = 0
+      }
+  {/if}
+
   </div>
   {/foreach}
 </div>