diff --git a/server/src/main/java/io/druid/client/RoutingDruidClient.java b/server/src/main/java/io/druid/client/RoutingDruidClient.java
index 9fd3e2b0eac1f78daec6769f35b0943a6358ace6..7ad4ec5d8204450ef36420968b5b04cd7caea2be 100644
--- a/server/src/main/java/io/druid/client/RoutingDruidClient.java
+++ b/server/src/main/java/io/druid/client/RoutingDruidClient.java
@@ -68,13 +68,12 @@ public class RoutingDruidClient<IntermediateType, FinalType>
   }
 
   public ListenableFuture<FinalType> run(
-      String host,
+      String url,
       Query query,
       HttpResponseHandler<IntermediateType, FinalType> responseHandler
   )
   {
     final ListenableFuture<FinalType> future;
-    final String url = String.format("http://%s/druid/v2/", host);
 
     try {
       log.debug("Querying url[%s]", url);
diff --git a/server/src/main/java/io/druid/server/AsyncQueryForwardingServlet.java b/server/src/main/java/io/druid/server/AsyncQueryForwardingServlet.java
index 26f2c8f6ff2467997cd450bac3ef1dad4c5cd590..4302b8692f82936fff3045cf15a70ad11d3b8643 100644
--- a/server/src/main/java/io/druid/server/AsyncQueryForwardingServlet.java
+++ b/server/src/main/java/io/druid/server/AsyncQueryForwardingServlet.java
@@ -210,7 +210,7 @@ public class AsyncQueryForwardingServlet extends HttpServlet
             @Override
             public void run()
             {
-              routingDruidClient.run(host, theQuery, responseHandler);
+              routingDruidClient.run(makeUrl(host, req), theQuery, responseHandler);
             }
           }
       );
@@ -236,4 +236,9 @@ public class AsyncQueryForwardingServlet extends HttpServlet
          .emit();
     }
   }
+
+  private String makeUrl(String host, HttpServletRequest req)
+  {
+    return String.format("http://%s%s?%s", host, req.getRequestURI(), req.getQueryString());
+  }
 }