diff --git a/lib/client/menu.js b/lib/client/menu.js
index 22699702..52097483 100644
--- a/lib/client/menu.js
+++ b/lib/client/menu.js
@@ -204,6 +204,8 @@ var CloudCmd, Util, DOM, CloudFunc, MenuIO;
         function download() {
             var element,
                 TIME    = 1000,
+                apiURL  = CloudFunc.apiURL,
+                FS      = CloudFunc.FS,
                 date    = Date.now(),
                 path    = Info.path,
                 id      = DOM.load.getIdBySrc(path),
@@ -211,7 +213,7 @@ var CloudCmd, Util, DOM, CloudFunc, MenuIO;
             
             Util.log('downloading file ' + path +'...');
             
-            path        = CloudFunc.FS + path + '?download' + dir;
+            path        = apiURL + FS + path + '?download' + dir;
             
             element     = DOM.load({
                 id          : id + '-' + date,
diff --git a/lib/server/rest.js b/lib/server/rest.js
index b9015e84..eb333e15 100644
--- a/lib/server/rest.js
+++ b/lib/server/rest.js
@@ -173,6 +173,7 @@
                         main.sendFile(p);
                     else {
                         p.name += '.json';
+                        p.query = query;
                         
                         if (isStr)
                             str = data;