add support for query_clients