Add 2 new select-clause columns to groupby clause.