diff --git a/index.php b/index.php
index 4df868727..e922cb23a 100644
--- a/index.php
+++ b/index.php
@@ -394,6 +394,7 @@ SELECT
     );
 
     // TODO: Send actual data
+/*
     $template->assign('TAGS_FOUND',
       array(
         'Link 1 / Sub link 1 / <a href="https://www.google.com"> Sub sub</a>',
@@ -412,6 +413,7 @@ SELECT
         'Link 4',
       )
     );
+*/
   }
 
   if (isset($page['category']) and is_admin() and $conf['index_edit_icon'])
diff --git a/themes/default/template/include/search_filters.inc.tpl b/themes/default/template/include/search_filters.inc.tpl
index 9091311c7..4aaba9aac 100644
--- a/themes/default/template/include/search_filters.inc.tpl
+++ b/themes/default/template/include/search_filters.inc.tpl
@@ -329,17 +329,23 @@ str_empty_search_bot_alt = "{'Pre-established filters are proposed, but you can
   </div>
 </div>
 
+{if isset($TAGS_FOUND) or isset($ALBUMS_FOUND)}
 <div class="mcs-side-results">
+  {if isset($TAGS_FOUND)}
   <div class="mcs-tags-found">
     <span class="mcs-side-badge">{count($TAGS_FOUND)}</span>
     <p>{'Tags found'|@translate}</p>
   </div>
+  {/if}
+  {if isset($ALBUMS_FOUND)}
   <div class="mcs-albums-found">
     <span class="mcs-side-badge">{count($ALBUMS_FOUND)}</span>
     <p>{'Albums found'|@translate}</p>
   </div>
+  {/if}
 </div>
 
+  {if isset($TAGS_FOUND)}
 <div class="tags-found-popin">
   <div class="tags-found-popin-container">
     <span class="pwg-icon-cancel tags-found-close"></span>
@@ -354,7 +360,8 @@ str_empty_search_bot_alt = "{'Pre-established filters are proposed, but you can
     </div>
   </div>
 </div>
-
+  {/if}
+  {if isset($ALBUMS_FOUND)}
 <div class="albums-found-popin">
   <div class="albums-found-popin-container">
     <span class="pwg-icon-cancel albums-found-close"></span>
@@ -369,3 +376,5 @@ str_empty_search_bot_alt = "{'Pre-established filters are proposed, but you can
     </div>
   </div>
 </div>
+  {/if}
+{/if}