diff --git a/lib/server/rest.js b/lib/server/rest.js
index fb68fc40..b9b7ed57 100644
--- a/lib/server/rest.js
+++ b/lib/server/rest.js
@@ -131,16 +131,15 @@
             
             switch (p.request.method) {
             case 'GET':
-                onFSGet(query, p.name, function(error, data, name, isFile) {
+                onFSGet(query, p.name, function(error, data, isFile) {
                     if (error)
                         sendError(params, error);
-                    else if (isFile) {
-                        p.name  = name;
-                        p.data  = data;
-                        
+                    else if (isFile)
                         main.sendFile(p);
-                    } else
+                    else {
+                        p.name += '.json';
                         sendResponse(p, data);
+                    }
                 });
             
             break;
@@ -346,15 +345,14 @@
                     func(error);
                 else
                     if (!isDir)
-                        func(null, null, null, !isDir);
+                        func(null, null, !isDir);
                     else
                         getDirContent(name, function(error, data) {
                             if (!error) {
-                                name += '.json';
                                 data = Util.stringifyJSON(data);
                             }
                             
-                            func(error, name, data);
+                            func(error, data);
                         });
             });
             break;