diff --git a/ccm-cms-types-organizationalunit/pdl/com/arsdigita/content-types/OrgaUnit2OrgaUnit.pdl b/ccm-cms-types-organizationalunit/pdl/com/arsdigita/content-types/OrgaUnit2OrgaUnit.pdl
index f3363751e..b873ecb91 100644
--- a/ccm-cms-types-organizationalunit/pdl/com/arsdigita/content-types/OrgaUnit2OrgaUnit.pdl
+++ b/ccm-cms-types-organizationalunit/pdl/com/arsdigita/content-types/OrgaUnit2OrgaUnit.pdl
@@ -64,6 +64,6 @@ query allUnitsOrderForUnit {
       	 select u.unit_order from ct_orgaunit2orgaunits u where u.owner_id = :ownerID
       }
       map {
-      	  unitOrder = u.unitOrder;
+      	  unitOrder = u.unit_order;
       }
 }
\ No newline at end of file
diff --git a/ccm-cms-types-organizationalunit/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/OrganizationalUnit.xml b/ccm-cms-types-organizationalunit/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/OrganizationalUnit.xml
index 96110662d..8f9676c3a 100644
--- a/ccm-cms-types-organizationalunit/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/OrganizationalUnit.xml
+++ b/ccm-cms-types-organizationalunit/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/OrganizationalUnit.xml
@@ -18,6 +18,13 @@
 			  component="com.arsdigita.cms.contenttypes.ui.OrganizationalUnitPropertiesStep"
 			  ordering="1"/>
 
+      <ctd:authoring-step labelKey="organizationalunit.authoring.subunits.title"
+			  labelBundle="com.arsdigita.cms.contenttypes.OrganizationalUnitResources"
+			  descriptionKey="organizationalunit.authoring.subunits_properties.description"
+			  descriptionBundle="com.arsdigita.cms.contenttypes.OrganizationalUnitResources"
+			  component="com.arsdigita.cms.contenttypes.ui.OrgaUnit2OrgaUnitPropertiesStep"
+			  ordering="2"/>
+      
       <ctd:include href="/WEB-INF/content-types/assign-categories-step.xml"/>
     </ctd:authoring-kit>
 
diff --git a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/OrgaUnit2OrgaUnit.java b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/OrgaUnit2OrgaUnit.java
index 53d3db79a..d146dc0e3 100644
--- a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/OrgaUnit2OrgaUnit.java
+++ b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/OrgaUnit2OrgaUnit.java
@@ -115,11 +115,11 @@ public class OrgaUnit2OrgaUnit extends ACSObject {
     }
 
     public void swapWithNext() {
-        swapWithNext("com.arsdigita.cms.cotenttypes.addUnitsOrderForUnit", "com.arsdigita.cms.contenttypes.swapOrgaUnit2OrgaUnitWithNextInGroup");
+        swapWithNext("com.arsdigita.cms.contenttypes.allUnitsOrderForUnit", "com.arsdigita.cms.contenttypes.swapOrgaUnit2OrgaUnitWithNextInGroup");
     }
 
     public void swapWithPrevious() {
-        swapWithPrevious("com.arsdigita.cms.cotenttypes.addUnitsOrderForUnit", "com.arsdigita.cms.contenttypes.swapOrgaUnit2OrgaUnitWithNextInGroup");
+        swapWithPrevious("com.arsdigita.cms.contenttypes.allUnitsOrderForUnit", "com.arsdigita.cms.contenttypes.swapOrgaUnit2OrgaUnitWithNextInGroup");
     }
 
     public void swapWithNext(String queryName, String operationName) {