Issue #216 Fixed validations of name and number fields