Additional fixes for whois regex