refactored CatalogController and RecordController