Add query client
Add query client to server