updated column_list_group handling of '*'
refactor queries into one statement