--- a/src/pyams_content/component/theme/zmi/manager.py	Wed Jun 24 12:07:40 2020 +0200
+++ b/src/pyams_content/component/theme/zmi/manager.py	Fri Jun 26 12:54:13 2020 +0200
@@ -17,8 +17,9 @@
 from zope.interface import alsoProvides
 
 from pyams_content import _
-from pyams_content.component.theme.interfaces import ICollectionsManager, ICollectionsManagerTarget, ITagsManager, \
-    ITagsManagerTarget, IThemesManager, IThemesManagerTarget
+from pyams_content.component.theme.interfaces import ICollectionsManager, \
+    ICollectionsManagerTarget, ITagsManager, ITagsManagerTarget, IThemesManager, \
+    IThemesManagerTarget
 from pyams_content.interfaces import MANAGE_SITE_ROOT_PERMISSION, MANAGE_TOOL_PERMISSION
 from pyams_content.zmi import pyams_content
 from pyams_form.form import ajax_config
@@ -50,7 +51,7 @@
 
 
 @pagelet_config(name='tags.html', context=ITagsManagerTarget, layer=IPyAMSLayer,
-                permission=MANAGE_TOOL_PERMISSION)
+                permission=MANAGE_SITE_ROOT_PERMISSION)
 @ajax_config(name='tags.json', context=ITagsManagerTarget, layer=IPyAMSLayer)
 class TagsManagerEditForm(AdminDialogEditForm):
     """Tags manager edit form"""
@@ -61,7 +62,6 @@
     dialog_class = 'modal-large'
 
     fields = field.Fields(ITagsManager)
-    fields['enable_tags_search'].widgetFactory = SingleCheckBoxFieldWidget
     fields['enable_glossary'].widgetFactory = SingleCheckBoxFieldWidget
 
     edit_permission = MANAGE_SITE_ROOT_PERMISSION
@@ -70,7 +70,8 @@
         return ITagsManager(self.context)
 
     def updateWidgets(self, prefix=None):
-        # We have to store thesaurus name if request header to be able to set extract name correctly
+        # We have to store thesaurus name in request header
+        # to be able to set extract name correctly
         # See :ref:`pyams_thesaurus.thesaurus.ThesaurusExtractsVocabulary`
         if self.request.method == 'POST':
             param_name = '{}widgets.thesaurus_name:list'.format(self.prefix)
@@ -88,13 +89,6 @@
         alsoProvides(widget, IObjectData)
 
     def updateGroups(self):
-        self.add_group(NamedWidgetsGroup(self, 'tags_search', self.widgets,
-                                         ('enable_tags_search', 'tags_search_target'),
-                                         legend=_("Enable search by tag"),
-                                         css_class='inner',
-                                         switch=True,
-                                         checkbox_switch=True,
-                                         checkbox_field=ITagsManager['enable_tags_search']))
         self.add_group(NamedWidgetsGroup(self, 'glossary', self.widgets,
                                          ('enable_glossary', 'glossary_thesaurus_name'),
                                          legend=_("Enable glossary"),
@@ -137,7 +131,8 @@
         return IThemesManager(self.context)
 
     def updateWidgets(self, prefix=None):
-        # We have to store thesaurus name if request header to be able to set extract name correctly
+        # We have to store thesaurus name in request header
+        # to be able to set extract name correctly
         # See :ref:`pyams_thesaurus.thesaurus.ThesaurusExtractsVocabulary`
         if self.request.method == 'POST':
             param_name = '{}widgets.thesaurus_name:list'.format(self.prefix)
@@ -159,8 +154,9 @@
 # Collections management view
 #
 
-@viewlet_config(name='collections-manager.menu', context=ICollectionsManagerTarget, layer=IAdminLayer,
-                manager=IPropertiesMenu, permission=MANAGE_TOOL_PERMISSION, weight=42)
+@viewlet_config(name='collections-manager.menu', context=ICollectionsManagerTarget,
+                layer=IAdminLayer, manager=IPropertiesMenu, permission=MANAGE_TOOL_PERMISSION,
+                weight=42)
 class CollectionsManagerMenu(MenuItem):
     """Collections menu"""
 
@@ -171,7 +167,7 @@
 
 
 @pagelet_config(name='collections.html', context=ICollectionsManagerTarget, layer=IPyAMSLayer,
-                permission=MANAGE_TOOL_PERMISSION)
+                permission=MANAGE_SITE_ROOT_PERMISSION)
 @ajax_config(name='collections.json', context=ICollectionsManagerTarget, layer=IPyAMSLayer)
 class CollectionsManagerEditForm(AdminDialogEditForm):
     """Collections manager edit form"""
@@ -179,15 +175,17 @@
     prefix = 'collections_manager.'
 
     legend = _("Selected collections")
+    dialog_class = 'modal-large'
 
     fields = field.Fields(ICollectionsManager)
-    edit_permission = MANAGE_TOOL_PERMISSION
+    edit_permission = MANAGE_SITE_ROOT_PERMISSION
 
     def getContent(self):
         return ICollectionsManager(self.context)
 
     def updateWidgets(self, prefix=None):
-        # We have to store thesaurus name if request header to be able to set extract name correctly
+        # We have to store thesaurus name in request header
+        # to be able to set extract name correctly
         # See :ref:`pyams_thesaurus.thesaurus.ThesaurusExtractsVocabulary`
         if self.request.method == 'POST':
             param_name = '{}widgets.thesaurus_name:list'.format(self.prefix)