Add groupId/groupName multi field for user/group filtering