Fix issues with multiple required field