Fixes logic in CatalogController#lookup_and_set_fields