improved cc_queries view/mappings