Add NotRequiredIfOneOf validator to other fields too