diff --git a/ccm-cms/pdl/com/arsdigita/content-types/GenericOrganizationalUnit.pdl b/ccm-cms/pdl/com/arsdigita/content-types/GenericOrganizationalUnit.pdl
index 0d3fa1903..e81c36d84 100644
--- a/ccm-cms/pdl/com/arsdigita/content-types/GenericOrganizationalUnit.pdl
+++ b/ccm-cms/pdl/com/arsdigita/content-types/GenericOrganizationalUnit.pdl
@@ -45,7 +45,7 @@ association {
                                                to cms_organizationalunits.organizationalunit_id;
 
     //Link attribute, allows it to customize the order which the childs will be shown.
-    BigDecimal[0..1] order = cms_organizationalunit_organizationalunit_map.order INTEGER;
+    BigDecimal[0..1] order = cms_organizationalunits_organizationalunit_map.map_order INTEGER;
 }
 
 //Link for contact points.
@@ -63,6 +63,6 @@ association {
 
    //Some link attributes.
    String contact_type = cms_organizationalunit_contact_map.contact_type VARCHAR(100);
-   BigDecimal contact_order = cms_organizationalunit_contact_map.contact_order INTEGER;
+   BigDecimal contact_order = cms_organizationalunits_contact_map.map_order INTEGER;
 
-}
\ No newline at end of file
+}
diff --git a/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg b/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg
index f0d73ff07..43a985509 100644
--- a/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg
+++ b/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg
@@ -7,6 +7,7 @@ ccm-cms-assets-fileattachment
 ccm-cms-assets-imagestep
 ccm-cms-assets-notes
 ccm-cms-assets-relatedlink
+ccm-cms-assets-imagestep
 
 # Content types
 ccm-cms-types-address