Index: /trunk/themes/default/template/menubar_tags.tpl
===================================================================
--- /trunk/themes/default/template/menubar_tags.tpl	(revision 5722)
+++ /trunk/themes/default/template/menubar_tags.tpl	(revision 5752)
@@ -4,8 +4,14 @@
 		{foreach from=$block->data item=tag}
 		<span>
-			<a class="tagLevel{$tag.level}" href="{$tag.U_ADD}"
+			<a class="tagLevel{$tag.level}"
+			{if isset($tag.U_ADD)}
+				href="{$tag.U_ADD}"
 				title="{$pwg->l10n_dec('%d image is also linked to current tags', '%d images are also linked to current tags', $tag.counter)}"
-				rel="nofollow">
-				+{$tag.name}</a></span>
+				rel="nofollow">+
+			{else}
+				href="{$tag.URL}"
+				title="{'See elements linked to this tag only'|@translate}">
+			{/if}
+				{$tag.name}</a></span>
 {* ABOVE there should be no space between text, </a> and </span> elements to avoid IE8 bug https://connect.microsoft.com/IE/feedback/ViewFeedback.aspx?FeedbackID=366567 *}
 		{/foreach}
Index: /trunk/include/menubar.inc.php
===================================================================
--- /trunk/include/menubar.inc.php	(revision 5703)
+++ /trunk/include/menubar.inc.php	(revision 5752)
@@ -111,30 +111,52 @@
 //------------------------------------------------------------------------ tags
   $block = $menu->get_block('mbTags');
-  if ( $block!=null and 'tags'==@$page['section'] and !empty($page['items']) )
-  {
-    $tags = get_common_tags(
-      $page['items'],
-      $conf['menubar_tag_cloud_items_number'],
-      $page['tag_ids']
-      );
-    $tags = add_level_to_tags($tags);
-
-    foreach ($tags as $tag)
-    {
-      $block->data[] = array_merge(
-        $tag,
-        array(
-          'U_ADD' => make_index_url(
-            array(
-              'tags' => array_merge(
-                $page['tags'],
-                array($tag)
+  if ( $block!=null and !empty($page['items']) )
+  {
+    if ('tags'==@$page['section'])
+    {
+      $tags = get_common_tags(
+        $page['items'],
+        $conf['menubar_tag_cloud_items_number'],
+        $page['tag_ids']
+        );
+      $tags = add_level_to_tags($tags);
+
+      foreach ($tags as $tag)
+      {
+        $block->data[] = array_merge(
+          $tag,
+          array(
+            'U_ADD' => make_index_url(
+              array(
+                'tags' => array_merge(
+                  $page['tags'],
+                  array($tag)
+                  )
                 )
-              )
-            ),
+              ),
+            'URL' => make_index_url( array( 'tags' => array($tag) )
+              ),
+            )
+          );
+      }
+    }
+    else
+    {
+      $selection = array_slice( $page['items'], $page['start'], $page['nb_image_page'] );
+      $tags = add_level_to_tags( get_common_tags($selection, 12) );
+      foreach ($tags as $tag)
+      {
+        $block->data[] =
+        array_merge( $tag,
+          array(
+            'URL' => make_index_url( array( 'tags' => array($tag) ) ),
           )
         );
-    }
-    $block->template = 'menubar_tags.tpl';
+      }
+    }
+    if ( !empty($block->data) )
+    {
+      $block->template = 'menubar_tags.tpl';
+    }
   }