Fix catalog_search and permissions