diff --git a/mock-api/server.js b/mock-api/server.js
index 2539f9a54..e227eda81 100644
--- a/mock-api/server.js
+++ b/mock-api/server.js
@@ -455,31 +455,31 @@ const emsesp_devicedata_1 = {
     {
       v: '(0)',
       u: 0,
-      n: 'error code',
+      n: '00error code',
       c: '',
     },
     {
       v: '14:54:39 06/06/2021',
       u: 0,
-      n: 'date/time',
+      n: '00date/time',
       c: '',
     },
     {
       v: 18,
       u: 1,
-      n: 'hc1 selected room temperature',
+      n: '00hc1 selected room temperature',
       c: 'hc1/seltemp',
     },
     {
       v: 22.6,
       u: 1,
-      n: 'hc1 current room temperature',
+      n: '00hc1 current room temperature',
       c: '',
     },
     {
       v: 'auto',
       u: 0,
-      n: 'hc1 mode',
+      n: '00hc1 mode',
       c: 'hc1/mode',
     },
   ],
@@ -488,81 +488,81 @@ const emsesp_devicedata_1 = {
 const emsesp_devicedata_2 = {
   label: 'Boiler: Nefit GBx72/Trendline/Cerapur/Greenstar Si/27i',
   data: [
-    { u: 0, n: 'reset', c: 'reset', l: ['-', 'maintenance', 'error'] },
-    { v: 'false', u: 0, n: 'heating active' },
-    { v: 'false', u: 0, n: 'tapwater active' },
-    { v: 5, u: 1, n: 'selected flow temperature', c: 'selflowtemp' },
-    { v: 0, u: 3, n: 'burner selected max power', c: 'selburnpow' },
-    { v: 0, u: 3, n: 'heating pump modulation' },
-    { v: 53.4, u: 1, n: 'current flow temperature' },
-    { v: 52.7, u: 1, n: 'return temperature' },
-    { v: 1.3, u: 10, n: 'system pressure' },
-    { v: 54.9, u: 1, n: 'actual boiler temperature' },
-    { v: 'false', u: 0, n: 'gas' },
-    { v: 'false', u: 0, n: 'gas stage 2' },
-    { v: 0, u: 9, n: 'flame current' },
-    { v: 'false', u: 0, n: 'heating pump' },
-    { v: 'false', u: 0, n: 'fan' },
-    { v: 'false', u: 0, n: 'ignition' },
-    { v: 'false', u: 0, n: 'oil preheating' },
-    { v: 'true', u: 0, n: 'heating activated', c: 'heatingactivated', l: ['off', 'on'] },
-    { v: 80, u: 1, n: 'heating temperature', c: 'heatingtemp' },
-    { v: 70, u: 3, n: 'burner pump max power', c: 'pumpmodmax' },
-    { v: 30, u: 3, n: 'burner pump min power', c: 'pumpmodmin' },
-    { v: 1, u: 8, n: 'pump delay', c: 'pumpdelay' },
-    { v: 10, u: 8, n: 'burner min period', c: 'burnminperiod' },
-    { v: 0, u: 3, n: 'burner min power', c: 'burnminpower' },
-    { v: 50, u: 3, n: 'burner max power', c: 'burnmaxpower' },
-    { v: -6, u: 2, n: 'hysteresis on temperature', c: 'boilhyston' },
-    { v: 6, u: 2, n: 'hysteresis off temperature', c: 'boilhystoff' },
-    { v: 0, u: 1, n: 'set flow temperature' },
-    { v: 0, u: 3, n: 'burner set power' },
-    { v: 0, u: 3, n: 'burner current power' },
-    { v: 326323, u: 0, n: 'burner starts' },
-    { v: 553437, u: 8, n: 'total burner operating time' },
-    { v: 451286, u: 8, n: 'total heat operating time' },
-    { v: 4672173, u: 8, n: 'total UBA operating time' },
-    { v: '1C(210) 06.06.2020 12:07 (0 min)', u: 0, n: 'last error code' },
-    { v: '0H', u: 0, n: 'service code' },
-    { v: 203, u: 0, n: 'service code number' },
-    { v: 'H00', u: 0, n: 'maintenance message' },
-    { v: 'manual', u: 0, n: 'maintenance scheduled', c: 'maintenance', l: ['off', 'time', 'date', 'manual'] },
-    { v: 6000, u: 7, n: 'time to next maintenance', c: 'maintenancetime' },
-    { v: '01.01.2012', u: 0, n: 'next maintenance date', c: 'maintenancedate', o: 'Format: < dd.mm.yyyy >' },
-    { v: 'true', u: 0, n: 'dhw turn on/off', c: 'wwtapactivated', l: ['off', 'on'] },
-    { v: 62, u: 1, n: 'dhw set temperature' },
-    { v: 60, u: 1, n: 'dhw selected temperature', c: 'wwseltemp' },
-    { v: 'flow', u: 0, n: 'dhw type' },
-    { v: 'hot', u: 0, n: 'dhw comfort', c: 'wwcomfort', l: ['hot', 'eco', 'intelligent'] },
-    { v: 40, u: 2, n: 'dhw flow temperature offset', c: 'wwflowtempoffset' },
-    { v: 100, u: 3, n: 'dhw max power', c: 'wwmaxpower' },
-    { v: 'false', u: 0, n: 'dhw circulation pump available', c: 'wwcircpump', l: ['off', 'on'] },
-    { v: '3-way valve', u: 0, n: 'dhw charging type' },
-    { v: -5, u: 2, n: 'dhw hysteresis on temperature', c: 'wwhyston' },
-    { v: 0, u: 2, n: 'dhw hysteresis off temperature', c: 'wwhystoff' },
-    { v: 70, u: 1, n: 'dhw disinfection temperature', c: 'wwdisinfectiontemp' },
+    { v: 'false', u: 0, n: '08heating active' },
+    { v: 'false', u: 0, n: '08tapwater active' },
+    { u: 0, n: '00reset', c: 'reset', l: ['-', 'maintenance', 'error'] },
+    { v: 5, u: 1, n: '00selected flow temperature', c: 'selflowtemp' },
+    { v: 0, u: 3, n: '00burner selected max power', c: 'selburnpow' },
+    { v: 0, u: 3, n: '00heating pump modulation' },
+    { v: 53.4, u: 1, n: '00current flow temperature' },
+    { v: 52.7, u: 1, n: '00return temperature' },
+    { v: 1.3, u: 10, n: '00system pressure' },
+    { v: 54.9, u: 1, n: '00actual boiler temperature' },
+    { v: 'false', u: 0, n: '00gas' },
+    { v: 'false', u: 0, n: '00gas stage 2' },
+    { v: 0, u: 9, n: '00flame current' },
+    { v: 'false', u: 0, n: '00heating pump' },
+    { v: 'false', u: 0, n: '00fan' },
+    { v: 'false', u: 0, n: '00ignition' },
+    { v: 'false', u: 0, n: '00oil preheating' },
+    { v: 'true', u: 0, n: '00heating activated', c: 'heatingactivated', l: ['off', 'on'] },
+    { v: 80, u: 1, n: '00heating temperature', c: 'heatingtemp' },
+    { v: 70, u: 3, n: '00burner pump max power', c: 'pumpmodmax' },
+    { v: 30, u: 3, n: '00burner pump min power', c: 'pumpmodmin' },
+    { v: 1, u: 8, n: '00pump delay', c: 'pumpdelay' },
+    { v: 10, u: 8, n: '00burner min period', c: 'burnminperiod' },
+    { v: 0, u: 3, n: '00burner min power', c: 'burnminpower' },
+    { v: 50, u: 3, n: '00burner max power', c: 'burnmaxpower' },
+    { v: -6, u: 2, n: '00hysteresis on temperature', c: 'boilhyston' },
+    { v: 6, u: 2, n: '00hysteresis off temperature', c: 'boilhystoff' },
+    { v: 0, u: 1, n: '00set flow temperature' },
+    { v: 0, u: 3, n: '00burner set power' },
+    { v: 0, u: 3, n: '00burner current power' },
+    { v: 326323, u: 0, n: '00burner starts' },
+    { v: 553437, u: 8, n: '00total burner operating time' },
+    { v: 451286, u: 8, n: '00total heat operating time' },
+    { v: 4672173, u: 8, n: '00total UBA operating time' },
+    { v: '1C(210) 06.06.2020 12:07 (0 min)', u: 0, n: '00last error code' },
+    { v: '0H', u: 0, n: '00service code' },
+    { v: 203, u: 0, n: '00service code number' },
+    { v: 'H00', u: 0, n: '00maintenance message' },
+    { v: 'manual', u: 0, n: '00maintenance scheduled', c: 'maintenance', l: ['off', 'time', 'date', 'manual'] },
+    { v: 6000, u: 7, n: '00time to next maintenance', c: 'maintenancetime' },
+    { v: '01.01.2012', u: 0, n: '00next maintenance date', c: 'maintenancedate', o: 'Format: < dd.mm.yyyy >' },
+    { v: 'true', u: 0, n: '00dhw turn on/off', c: 'wwtapactivated', l: ['off', 'on'] },
+    { v: 62, u: 1, n: '00dhw set temperature' },
+    { v: 60, u: 1, n: '00dhw selected temperature', c: 'wwseltemp' },
+    { v: 'flow', u: 0, n: '00dhw type' },
+    { v: 'hot', u: 0, n: '00dhw comfort', c: 'wwcomfort', l: ['hot', 'eco', 'intelligent'] },
+    { v: 40, u: 2, n: '00dhw flow temperature offset', c: 'wwflowtempoffset' },
+    { v: 100, u: 3, n: '00dhw max power', c: 'wwmaxpower' },
+    { v: 'false', u: 0, n: '00dhw circulation pump available', c: 'wwcircpump', l: ['off', 'on'] },
+    { v: '3-way valve', u: 0, n: '00dhw charging type' },
+    { v: -5, u: 2, n: '00dhw hysteresis on temperature', c: 'wwhyston' },
+    { v: 0, u: 2, n: '00dhw hysteresis off temperature', c: 'wwhystoff' },
+    { v: 70, u: 1, n: '00dhw disinfection temperature', c: 'wwdisinfectiontemp' },
     {
       v: 'off',
       u: 0,
-      n: 'dhw circulation pump mode',
+      n: '00dhw circulation pump mode',
       c: 'wwcircmode',
       l: ['off', '1x3min', '2x3min', '3x3min', '4x3min', '5x3min', '6x3min', 'continuous'],
     },
-    { v: 'false', u: 0, n: 'dhw circulation active', c: 'wwcirc', l: ['off', 'on'] },
-    { v: 47.3, u: 1, n: 'dhw current intern temperature' },
-    { v: 0, u: 4, n: 'dhw current tap water flow' },
-    { v: 47.3, u: 1, n: 'dhw storage intern temperature' },
-    { v: 'true', u: 0, n: 'dhw activated', c: 'wwactivated', l: ['off', 'on'] },
-    { v: 'false', u: 0, n: 'dhw one time charging', c: 'wwonetime', l: ['off', 'on'] },
-    { v: 'false', u: 0, n: 'dhw disinfecting', c: 'wwdisinfecting', l: ['off', 'on'] },
-    { v: 'false', u: 0, n: 'dhw charging' },
-    { v: 'false', u: 0, n: 'dhw recharging' },
-    { v: 'true', u: 0, n: 'dhw temperature ok' },
-    { v: 'false', u: 0, n: 'dhw active' },
-    { v: 'true', u: 0, n: 'dhw 3way valve active' },
-    { v: 0, u: 3, n: 'dhw set pump power' },
-    { v: 288768, u: 0, n: 'dhw starts' },
-    { v: 102151, u: 8, n: 'dhw active time' },
+    { v: 'false', u: 0, n: '00dhw circulation active', c: 'wwcirc', l: ['off', 'on'] },
+    { v: 47.3, u: 1, n: '00dhw current intern temperature' },
+    { v: 0, u: 4, n: '00dhw current tap water flow' },
+    { v: 47.3, u: 1, n: '00dhw storage intern temperature' },
+    { v: 'true', u: 0, n: '00dhw activated', c: 'wwactivated', l: ['off', 'on'] },
+    { v: 'false', u: 0, n: '00dhw one time charging', c: 'wwonetime', l: ['off', 'on'] },
+    { v: 'false', u: 0, n: '00dhw disinfecting', c: 'wwdisinfecting', l: ['off', 'on'] },
+    { v: 'false', u: 0, n: '00dhw charging' },
+    { v: 'false', u: 0, n: '00dhw recharging' },
+    { v: 'true', u: 0, n: '00dhw temperature ok' },
+    { v: 'false', u: 0, n: '00dhw active' },
+    { v: 'true', u: 0, n: '00dhw 3way valve active' },
+    { v: 0, u: 3, n: '00dhw set pump power' },
+    { v: 288768, u: 0, n: '00dhw starts' },
+    { v: 102151, u: 8, n: '00dhw active time' },
   ],
 }
 
@@ -572,19 +572,19 @@ const emsesp_devicedata_4 = {
     {
       v: 16,
       u: 1,
-      n: 'hc2 selected room temperature',
+      n: '00hc2 selected room temperature',
       c: 'hc2/seltemp',
     },
     {
       v: 18.6,
       u: 1,
-      n: 'hc2 current room temperature',
+      n: '00hc2 current room temperature',
       c: '',
     },
     {
       v: 'off',
       u: 0,
-      n: 'hc2 mode',
+      n: '00hc2 mode',
       c: 'hc2/mode',
     },
   ],
@@ -593,21 +593,21 @@ const emsesp_devicedata_4 = {
 const emsesp_deviceentities_1 = [
   {
     v: '(0)',
-    n: 'error code',
+    n: '00error code',
     s: 'errorcode',
     m: 0,
     i: 1,
   },
   {
     v: '14:54:39 06/06/2021',
-    n: 'date/time',
+    n: '00date/time',
     s: 'datetime',
     m: 0,
     i: 2,
   },
   {
     v: 18.22,
-    n: 'hc1 selected room temperature',
+    n: '00hc1 selected room temperature',
     s: 'hc1/seltemp',
     m: 0,
     w: true,
@@ -615,14 +615,14 @@ const emsesp_deviceentities_1 = [
   },
   {
     v: 22.6,
-    n: 'hc1 current room temperature',
+    n: '00hc1 current room temperature',
     s: 'hc1/curtemp',
     m: 0,
     i: 4,
   },
   {
     v: 'auto',
-    n: 'hc1 mode',
+    n: '00hc1 mode',
     s: 'hc1/mode',
     m: 0,
     w: true,