Fixes for CatalogAPI