NTFY-88 Allow some more characters in the regex.