clean up whois task, hosts now use 'name' vs 'ip_address' and added emailaddress entity