[vcloud_director] Improve query service support