fixed validation and block submit, if validation errors