Fixed part of the validation issue and regex included.