Modify more group fields for the report builder