diff --git a/cloudcmd.js b/cloudcmd.js
index 37892631..37ce4d7d 100644
--- a/cloudcmd.js
+++ b/cloudcmd.js
@@ -265,7 +265,7 @@
             main.commander.getDirContent(p.name, function(pError, pJSON){
                 if(!pError){
                     var lQuery = main.getQuery(p.request);
-                    if(lQuery === 'json'){
+                    if( Util.isContainStr(lQuery, 'json') ){
                         p.data  = Util.stringifyJSON(pJSON);
                         p.name +='.json';
                         main.sendResponse(p);
diff --git a/lib/client/menu.js b/lib/client/menu.js
index 0f245960..ffb325a7 100644
--- a/lib/client/menu.js
+++ b/lib/client/menu.js
@@ -1,8 +1,8 @@
 /* object contains jQuery-contextMenu
  * https://github.com/medialize/jQuery-contextMenu
  */
-var CloudCommander, Util, DOM, $;
-(function(CloudCmd, Util, DOM){
+var CloudCommander, Util, DOM, CloudFunc, $;
+(function(CloudCmd, Util, DOM, CloudFunc){
     'use strict';
     
     var KeyBinding                  = CloudCmd.KeyBinding,
@@ -129,7 +129,7 @@ var CloudCommander, Util, DOM, $;
         
         Util.log('downloading file ' + lPath +'...');
         
-        lPath = lPath + '?download';
+        lPath = CloudFunc.FS + lPath + '?download';
         
         if(!DOM.getById(lId)){
             var lDownload = DOM.anyload({
@@ -304,4 +304,4 @@ var CloudCommander, Util, DOM, $;
     };
     
     CloudCmd.Menu                   = Menu;
-})(CloudCommander, Util, DOM);
\ No newline at end of file
+})(CloudCommander, Util, DOM, CloudFunc);
\ No newline at end of file
diff --git a/lib/server/main.js b/lib/server/main.js
index 04c5147d..001900c8 100644
--- a/lib/server/main.js
+++ b/lib/server/main.js
@@ -176,7 +176,7 @@
             if( !Util.isContainStr(lType, 'img') )
                 lContentEncoding = '; charset=UTF-8';
             
-            if( Util.strCmp(p.query, 'download') )
+            if( Util.isContainStr(p.query, 'download') )
                 lType = 'application/octet-stream';