fix many fields to work with group field