Validate all fields and make regexp stricter