fixes #3697 - more comprehensive field validations