goupBy additional fields fix