diff --git a/ccm-navigation/sql/ccm-navigation/upgrade/default/6.6.2-6.6.3/upd_system_tables.sql b/ccm-navigation/sql/ccm-navigation/upgrade/default/6.6.2-6.6.3/upd_system_tables.sql
index 21b6ad9b7..8b590a028 100644
--- a/ccm-navigation/sql/ccm-navigation/upgrade/default/6.6.2-6.6.3/upd_system_tables.sql
+++ b/ccm-navigation/sql/ccm-navigation/upgrade/default/6.6.2-6.6.3/upd_system_tables.sql
@@ -46,7 +46,8 @@ ALTER TABLE init_requirements
 
 
 update application_types
-   set object_type=replace(object_type,'london.navigation','navigation')
+   set object_type=replace(object_type,'london.navigation','navigation'),
+       singleton_p=false
  where object_type like '%london.navigation%' ;
 
 -- table applications doesn't require an update
diff --git a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentExtraXmlGenerator.java b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentExtraXmlGenerator.java
index 48bf204b5..ff01b1339 100644
--- a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentExtraXmlGenerator.java
+++ b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentExtraXmlGenerator.java
@@ -49,8 +49,11 @@ public class SciDepartmentExtraXmlGenerator extends GenericOrgaUnitExtraXmlGener
         }
 
         final SciDepartment department = (SciDepartment) item;
-
+        
         if (getListMode()) {
+            final Element shortDescElem = element.newChildElement("shortDescription");
+            shortDescElem.setText(department.getDepartmentShortDescription());
+            
             if (CONFIG.getShowHeadInList()) {
                 generateHeadOfDepartmentXml(department, element, state);
             }
@@ -101,7 +104,7 @@ public class SciDepartmentExtraXmlGenerator extends GenericOrgaUnitExtraXmlGener
                                               activeStatus));
         }
 
-        final Element elem = parent.newChildElement(elemName);
+        final Element elem = parent.newChildElement(String.format("%ss", elemName));
 
         final GenericOrganizationalUnitPersonCollection persons = department.getPersons();
         persons.addFilter(roleFilter.toString());
@@ -121,7 +124,7 @@ public class SciDepartmentExtraXmlGenerator extends GenericOrgaUnitExtraXmlGener
                                             parent,
                                             state,
                                             CONFIG.getHeadRole(),
-                                            "heads");
+                                            "head");
     }
 
     protected void generateViceHeadOfDepartmentXml(final SciDepartment department,
@@ -131,7 +134,7 @@ public class SciDepartmentExtraXmlGenerator extends GenericOrgaUnitExtraXmlGener
                                             parent,
                                             state,
                                             CONFIG.getViceHeadRole(),
-                                            "viceheads");
+                                            "vicehead");
     }
 
     protected void generateSecretariatOfDepartmentXml(final SciDepartment department,
diff --git a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentSummaryTab.java b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentSummaryTab.java
index ca67fed94..529d7b99c 100644
--- a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentSummaryTab.java
+++ b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentSummaryTab.java
@@ -145,7 +145,7 @@ public class SciDepartmentSummaryTab implements GenericOrgaUnitTab {
                                               activeStatus));
         }
 
-        final Element elem = parent.newChildElement(elemName);
+        final Element elem = parent.newChildElement(String.format("%ss", elemName));
 
         final GenericOrganizationalUnitPersonCollection persons = department.getPersons();
         persons.addFilter(roleFilter.toString());
@@ -165,7 +165,7 @@ public class SciDepartmentSummaryTab implements GenericOrgaUnitTab {
                                             parent,
                                             state,
                                             CONFIG.getHeadRole(),
-                                            "heads");
+                                            "head");
     }
 
     protected void generateViceHeadOfDepartmentXml(final SciDepartment department,
@@ -175,7 +175,7 @@ public class SciDepartmentSummaryTab implements GenericOrgaUnitTab {
                                             parent,
                                             state,
                                             CONFIG.getViceHeadRole(),
-                                            "viceheads");
+                                            "vicehead");
     }
 
     protected void generateSecretariatOfDepartmentXml(final SciDepartment department,
diff --git a/ccm-subsite/src/com/arsdigita/subsite/Site.java b/ccm-subsite/src/com/arsdigita/subsite/Site.java
index ceb6a5d75..a483df92b 100755
--- a/ccm-subsite/src/com/arsdigita/subsite/Site.java
+++ b/ccm-subsite/src/com/arsdigita/subsite/Site.java
@@ -70,6 +70,10 @@ public class Site extends ACSObject {
     public Site(DataObject obj) {
         super(obj);
     }
+    
+    public Site(final OID oid) {
+        super(oid);
+    }
 
     public static Site create(String title,
                               String description,