An attempt at fixing WHOIS