Fixed grouping by alias