MMakor improvment, however whois timeouts still break queuing