Added new columns to the group by (for MS SQL)