SCAL-512: hardening validation regexpes