--- a/schema.py	Fri Jan 14 18:30:32 2011 +0100
+++ b/schema.py	Fri Jan 14 18:30:37 2011 +0100
@@ -83,7 +83,7 @@
                       'SubWorkflowExitPoint'))
 
 INTERNAL_TYPES = set(('CWProperty', 'CWPermission', 'CWCache', 'ExternalUri',
-                      'CWSource', 'CWSourceAlias',
+                      'CWSource', 'CWSourceHostConfig',
 ))
 
 

--- a/web/uicfg.py	Fri Jan 14 18:30:32 2011 +0100
+++ b/web/uicfg.py	Fri Jan 14 18:30:37 2011 +0100
@@ -128,6 +128,7 @@
 indexview_etype_section = InitializableDict(
     EmailAddress='subobject',
     # entity types in the 'system' table by default (managers only)
+    CWSource='system',
     CWUser='system', CWGroup='system',
     CWPermission='system',
     CWCache='system',

--- a/web/views/schema.py	Fri Jan 14 18:30:32 2011 +0100
+++ b/web/views/schema.py	Fri Jan 14 18:30:37 2011 +0100
@@ -45,7 +45,7 @@
 ALWAYS_SKIP_TYPES = BASE_TYPES | SCHEMA_TYPES
 SKIP_TYPES  = (ALWAYS_SKIP_TYPES | META_RTYPES | SYSTEM_RTYPES | WORKFLOW_TYPES
                | INTERNAL_TYPES)
-SKIP_TYPES.update(set(('CWUser', 'CWGroup')))
+SKIP_TYPES.update(set(('CWUser', 'CWGroup', 'EmailAddress', 'Bookmark')))
 
 def skip_types(req):
     if int(req.form.get('skipmeta', True)):