Adding querying by FQDN