APOLLO-3679 Update for displayname and grouping