Catalog queries now are working properly