Allow multiple ways to group fields in UI