--- a/src/pyams_content/shared/view/theme.py	Mon Jan 07 11:36:09 2019 +0100
+++ b/src/pyams_content/shared/view/theme.py	Tue Jan 08 14:02:06 2019 +0100
@@ -82,6 +82,8 @@
         tags = settings.get_tags_index(context)
         if tags:
             yield Any(catalog['tags'], tags)
+        elif settings.select_context_tags:
+            yield None
 
 
 @adapter_config(name='tags', context=SearchFolderQuery, provides=IViewUserQuery)
@@ -156,6 +158,8 @@
         themes = settings.get_themes_index(context)
         if themes:
             yield Any(catalog['themes'], themes)
+        elif settings.select_context_themes:
+            yield None
 
 
 #
@@ -209,3 +213,5 @@
         collections = settings.get_collections_index(context)
         if collections:
             yield Any(catalog['collections'], collections)
+        elif settings.select_context_collections:
+            yield None