Added "id" column to group by columns