Improve search functionality in catalogs