diff --git a/cloudcmd.js b/cloudcmd.js
index a32ea050..52edd352 100644
--- a/cloudcmd.js
+++ b/cloudcmd.js
@@ -192,8 +192,13 @@
                 lRet = main.sendFile( pParams );
             }
             else if( Util.isContainStr(p.name, FS) || Util.strCmp( p.name, '/') ){
-                if( !main.getQuery(p.request) )
+                var lQuery = main.getQuery(p.request);
+                
+                if( !lQuery )
                     p.request.url += '?html';
+                else if(lQuery === '?download')
+                    lQuery += '&&html';
+                    
                 
                 var lName = Minify.allowed.html ? 
                     Minify.getName(INDEX) : INDEX;
diff --git a/lib/client.js b/lib/client.js
index fbd8d591..ff652cab 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -446,12 +446,13 @@ CloudCmd._changeLinks            = function(pPanelID){
         lOnDragStart_f = function(pEvent){
             var lElement    = pEvent.target,
                 lLink       = lElement.href,
-                lName       = lElement.textContent,
-                /* if it's directory - adding json extension */
-                lType       = lElement.parentElement.nextSibling;
+                lName       = lElement.textContent;
             
-            if(lType && lType.textContent === '<dir>')
+            /* if it's directory - adding json extension */
+            if( DOM.isCurrentDir() ){
                 lName       += '.json';
+                lLink       += '?json';
+            }
             
             pEvent.dataTransfer.setData("DownloadURL",
                 'application/octet-stream'  + ':' +