--- a/web/uicfg.py	Thu Jan 27 07:44:08 2011 +0100
+++ b/web/uicfg.py	Thu Jan 27 07:45:14 2011 +0100
@@ -53,7 +53,7 @@
 from cubicweb.rtags import (RelationTags, RelationTagsBool, RelationTagsSet,
                             RelationTagsDict, NoTargetRelationTagsDict,
                             register_rtag, _ensure_str_key)
-from cubicweb.schema import META_RTYPES
+from cubicweb.schema import META_RTYPES, INTERNAL_TYPES, WORKFLOW_TYPES
 
 
 # primary view configuration ##################################################
@@ -120,6 +120,8 @@
                 continue
             if eschema.schema_entity():
                 self.setdefault(eschema, 'schema')
+            elif eschema in INTERNAL_TYPES or eschema in WORKFLOW_TYPES:
+                self.setdefault(eschema, 'system')
             elif eschema.is_subobject(strict=True):
                 self.setdefault(eschema, 'subobject')
             else:
@@ -127,14 +129,9 @@
 
 indexview_etype_section = InitializableDict(
     EmailAddress='subobject',
+    Bookmark='system',
     # entity types in the 'system' table by default (managers only)
-    CWSource='system',
     CWUser='system', CWGroup='system',
-    CWPermission='system',
-    CWCache='system',
-    Workflow='system',
-    ExternalUri='system',
-    Bookmark='system',
     )
 
 # autoform.AutomaticEntityForm configuration ##################################