fix: handle issue with field group names