subcatalog fixes