diff --git a/lib/client/dom.js b/lib/client/dom.js
index 400c8eab..b9f67c00 100644
--- a/lib/client/dom.js
+++ b/lib/client/dom.js
@@ -1275,24 +1275,32 @@ var CloudCommander, Util,
             lParent     = lCurrent.parentElement,
             lName       = DOM.getCurrentName(lCurrent),
             lUrl        = DOM.getCurrentPath(lCurrent);
+            
+        if( DOM.isCurrentIsDir(lCurrent) )
+            lUrl += '?dir';
         
         if(lCurrent && lParent && lName !== '..'){
-            DOM.ajax({
-                method  : 'DELETE',
-                url     : lUrl,
-                error   : DOM.Images.showError,
-                success : function(pData){
-                    var lNext       = lCurrent.nextSibling,
-                        lPrevious   = lCurrent.previousSibling;
-                    
-                    if(lNext)
-                        DOM.setCurrentFile(lNext);
-                    else if(lPrevious)
-                        DOM.setCurrentFile(lPrevious);
-                    
-                    lParent.removeChild(lCurrent);
-                    Util.log(pData);
-                }
+            DOM.Images.showLoad();
+            CloudCommander.getConfig(function(pConfig){
+                lUrl = pConfig && pConfig.api_url + lUrl;
+                DOM.ajax({
+                    method  : 'DELETE',
+                    url     : lUrl,
+                    error   : DOM.Images.showError,
+                    success : function(pData){
+                        var lNext       = lCurrent.nextSibling,
+                            lPrevious   = lCurrent.previousSibling;
+                        
+                        DOM.Images.hideLoad();
+                        if(lNext)
+                            DOM.setCurrentFile(lNext);
+                        else if(lPrevious)
+                            DOM.setCurrentFile(lPrevious);
+                        
+                        lParent.removeChild(lCurrent);
+                        Util.log(pData);
+                    }
+                });
             });
         }
         
diff --git a/lib/server/rest.js b/lib/server/rest.js
index 390afa92..1df9873e 100644
--- a/lib/server/rest.js
+++ b/lib/server/rest.js
@@ -108,7 +108,7 @@
             var p       = pParams,
                 lQuery  = main.getQuery(p.request);
             
-            p.name  = Util.removeStr(pParams.name, CloudFunc.FS) || '/';
+            p.name  = Util.removeStr(pParams.name, [CloudFunc.FS, '?dir']) || '/';
             switch(p.method){
                 case 'GET':
                     fs.stat(p.name, function(pError, pStat){
@@ -133,8 +133,6 @@
                     break;
                     
                 case 'PUT':
-                    p.name = Util.removeStr(p.name, '?dir');
-                    
                     if(lQuery === 'dir')
                         fs.mkdir(p.name, function(pError){
                             if(!pError)