[vcloud_director] Improve support for query service.