Update QueryMessages to use whois variant system prop
Update QueryMessages to use whois variant system prop