Place non-aggregate columns in group-by too