diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitSubordinateOrgaUnitsTable.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitSubordinateOrgaUnitsTable.java
index 68695d7b5..6f96350dd 100644
--- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitSubordinateOrgaUnitsTable.java
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitSubordinateOrgaUnitsTable.java
@@ -295,6 +295,18 @@ public class GenericOrganizationalUnitSubordinateOrgaUnitsTable
             final GenericOrganizationalUnitSubordinateCollection subOrgaUnits =
                                                                  orgaunit.
                     getSubordinateOrgaUnits();
+            if ((customizer.getAssocType() != null)
+                && !(customizer.getAssocType().isEmpty())) {
+                subOrgaUnits.addFilter(String.format(
+                        "link.assocType = '%s'",
+                        customizer.getAssocType()));
+            }
+            if ((customizer.getContentType() != null)
+                && !(customizer.getContentType().isEmpty())) {
+                subOrgaUnits.addFilter(String.format("objectType = '%s'",
+                                                             customizer.
+                        getContentType()));
+            }
 
             if ((subOrgaUnits.size() - 1) == row) {
                 final Label label = new Label("");
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPublicationsTable.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPublicationsTable.java
index 7865f9a0d..786f02bb9 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPublicationsTable.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPublicationsTable.java
@@ -21,7 +21,6 @@ import com.arsdigita.cms.contenttypes.GenericOrganizationalUnitPublicationsColle
 import com.arsdigita.cms.contenttypes.Publication;
 import com.arsdigita.cms.dispatcher.ItemResolver;
 import com.arsdigita.cms.dispatcher.Utilities;
-import com.arsdigita.developersupport.Comodifications;
 import com.arsdigita.util.LockableImpl;
 import java.math.BigDecimal;
 
@@ -221,8 +220,8 @@ public class GenericOrganizationalUnitPublicationsTable
         public void cellSelected(final TableActionEvent event) {
             final PageState state = event.getPageState();
 
-            final Publication publication = new Publication((BigDecimal) event.
-                    getRowKey());
+            final Publication publication = new Publication(new BigDecimal(event.
+                    getRowKey().toString()));
             final GenericOrganizationalUnit orgaunit =
                                             (GenericOrganizationalUnit) itemModel.
                     getSelectedObject(state);