Add identifier column and remove name from groupable columns