Improve consistency of text validations