bug fix to add required fields inside a FieldSet having proper validation