[BUGFIX] Improve usability of group fields