Fixed GROUP BY, HAVING in Aggregates