Improved aggregate to remove aggregates from function list when grouping by them
Improved aggregate to remove aggregates from function list when grouping by them