diff --git a/src/store/actions.js b/src/store/actions.js
index 0efe8c51..cf6af046 100644
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -118,6 +118,27 @@ export default {
 
     getObjectInfo({ commit }, data) {
         commit('setObjectData', data);
+
+        let subscripts = {}
+
+        for (let key of Object.keys(data)) {
+            let nameSplit = key.split(" ");
+
+            if (
+                nameSplit[0] === "temperature_fan" ||
+                nameSplit[0] === "temperature_probe" ||
+                nameSplit[0] === "temperature_sensors" ||
+                nameSplit[0] === "filament_switch_sensor" ||
+                nameSplit[0] === "bed_mesh"
+            )  subscripts = {...subscripts, [key]: []}
+        }
+
+        if (subscripts !== {}) Vue.prototype.$socket.sendObj('post_printer_objects_subscription', subscripts);
+        if (subscripts.bed_mesh) Vue.prototype.$socket.sendObj('get_printer_objects_status', { bed_mesh: [] }, 'getPrinterData');
+    },
+
+    getPrinterData({ commit }, data) {
+        commit('setPrinterData', data);
     },
 
     getHeatersInfo({ commit }, data) {
@@ -282,6 +303,10 @@ export default {
         commit('removeLoading', { name: 'bedMeshClear' });
     },
 
+    responseBedMeshCalibrate({commit}) {
+        commit('removeLoading', { name: 'bedMeshCalibrate' });
+    },
+
     responseBedMeshSave({commit}) {
         commit('removeLoading', { name: 'bedMeshSave' });
     },
diff --git a/src/store/getters.js b/src/store/getters.js
index 6d15081f..13241fe2 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -227,8 +227,9 @@ export default {
 
             if (nameSplit.length > 1 && nameSplit[0] === "bed_mesh" && nameSplit[1] !== undefined) {
                 profiles.push({
-                    name: nameSplit[1]+(currentProfile === nameSplit[1] ? " (current)": ""),
-                    data: value
+                    name: nameSplit[1],
+                    data: value,
+                    is_active: (currentProfile === nameSplit[1] ? true: false),
                 });
             }
         }
diff --git a/src/store/mutations.js b/src/store/mutations.js
index b10b5664..55761b66 100644
--- a/src/store/mutations.js
+++ b/src/store/mutations.js
@@ -31,13 +31,14 @@ export default {
                         datasets: [],
                     },
                     helplist: [],
-                    files: [],
+                    filetree: [],
                 }
             }
         );
     },
 
     setPrinterData(state, data) {
+        if (data.requestParams) delete data.requestParams;
         let now = Date.now();
 
         Object.entries(data).forEach(([key, value]) => {
@@ -173,21 +174,6 @@ export default {
 
     setObjectData(state, data) {
         Object.assign(state.object, data);
-        let subscripts = {}
-
-        for (let key of Object.keys(data)) {
-            let nameSplit = key.split(" ");
-
-            if (
-                nameSplit[0] === "temperature_fan" ||
-                nameSplit[0] === "temperature_probe" ||
-                nameSplit[0] === "temperature_sensors" ||
-                nameSplit[0] === "filament_switch_sensor" ||
-                nameSplit[0] === "bed_mesh"
-            )  subscripts = {...subscripts, [key]: []}
-        }
-
-        if (subscripts.length) Vue.prototype.$socket.sendObj('post_printer_objects_subscription', subscripts);
     },
 
     setPrinterConfig(state, data) {
@@ -221,11 +207,11 @@ export default {
 
     setDirectory(state, data) {
         let parent = undefined;
-        let parentPath = "";
+        //let parentPath = "";
         if (data && data.requestParams && data.requestParams.path) {
             let arrayPath = data.requestParams.path.split("/");
             parent = findDirectory(state.filetree, arrayPath);
-            parentPath = data.requestParams.path;
+            //parentPath = data.requestParams.path;
         }
 
         if (parent === undefined) parent = state.filetree;
@@ -246,8 +232,6 @@ export default {
                         modified: Date.parse(dir.modified),
                         childrens: [],
                     });
-
-                    Vue.prototype.$socket.sendObj('get_directory', { path: parentPath+"/"+dir.dirname }, 'getDirectory');
                 }
             }
         }