Fix the group by without aggregation