diff --git a/mock-api/server.js b/mock-api/server.js
index e8aa0ee4d..22b414d00 100644
--- a/mock-api/server.js
+++ b/mock-api/server.js
@@ -302,7 +302,7 @@ const EMSESP_BOARDPROFILE_ENDPOINT = REST_ENDPOINT_ROOT + 'boardProfile'
 const EMSESP_WRITE_VALUE_ENDPOINT = REST_ENDPOINT_ROOT + 'writeValue'
 const EMSESP_WRITE_SENSOR_ENDPOINT = REST_ENDPOINT_ROOT + 'writeSensor'
 const EMSESP_WRITE_ANALOG_ENDPOINT = REST_ENDPOINT_ROOT + 'writeAnalog'
-const EMSESP_EXCLUDE_ENTITIES_ENDPOINT = REST_ENDPOINT_ROOT + 'excludeEntities'
+const EMSESP_MASKED_ENTITIES_ENDPOINT = REST_ENDPOINT_ROOT + 'maskedEntities'
 const EMSESP_RESET_CUSTOMIZATIONS_ENDPOINT = REST_ENDPOINT_ROOT + 'resetCustomizations'
 
 settings = {
@@ -574,21 +574,21 @@ const emsesp_devicedata_4 = {
       u: 1,
       n: 'hc2 selected room temperature',
       c: 'hc2/seltemp',
-      x: false,
+      m: 0,
     },
     {
       v: 18.6,
       u: 1,
       n: 'hc2 current room temperature',
       c: '',
-      x: true,
+      m: 7,
     },
     {
       v: 'off',
       u: 0,
       n: 'hc2 mode',
       c: 'hc2/mode',
-      x: true,
+      m: 7,
     },
   ],
 }
@@ -598,119 +598,119 @@ const emsesp_deviceentities_1 = [
     v: '(0)',
     n: 'error code',
     s: 'errorcode',
-    x: false,
+    m: 0,
     i: 1,
   },
   {
     v: '14:54:39 06/06/2021',
     n: 'date/time',
     s: 'datetime',
-    x: false,
+    m: 0,
     i: 2,
   },
   {
     v: 18.22,
     n: 'hc1 selected room temperature',
     s: 'hc1/seltemp',
-    x: false,
+    m: 0,
     i: 3,
   },
   {
     v: 22.6,
     n: 'hc1 current room temperature',
     s: 'hc1/curtemp',
-    x: false,
+    m: 0,
     i: 4,
   },
   {
     v: 'auto',
     n: 'hc1 mode',
     s: 'hc1/mode',
-    x: false,
+    m: 0,
     i: 5,
   },
 ]
 
 const emsesp_deviceentities_2 = [
-  { v: false, n: 'heating active', s: 'heatingactive', x: false, i: 1 },
-  { v: false, n: 'tapwater active', s: 'tapwateractive', x: false, i: 2 },
-  { v: 5, n: 'selected flow temperature', s: 'selflowtemp', x: false, i: 3 },
-  { v: 0, n: 'burner selected max power', s: 'selburnpow', x: false, i: 4 },
-  { v: 0, n: 'heating pump modulation', s: 'heatingpumpmod', x: false, i: 5 },
-  { n: 'heating pump 2 modulation', s: 'heatingpump2mod', x: true, i: 6 },
-  { n: 'outside temperature', s: 'outdoortemp', x: true, i: 7 },
-  { v: 53, n: 'current flow temperature', s: 'curflowtemp', x: false, i: 8 },
-  { v: 51.8, n: 'return temperature', s: 'rettemp', x: false, i: 9 },
-  { n: 'mixing switch temperature', s: 'switchtemp', x: true, i: 10 },
-  { v: 1.3, n: 'system pressure', s: 'syspress', x: false, i: 11 },
-  { v: 54.6, n: 'actual boiler temperature', s: 'boiltemp', x: false, i: 12 },
-  { n: 'exhaust temperature', s: 'exhausttemp', x: true, i: 13 },
-  { v: false, n: 'gas', s: 'burngas', x: false, i: 14 },
-  { v: false, n: 'gas stage 2', s: 'burngas2', x: false, i: 15 },
-  { v: 0, n: 'flame current', s: 'flamecurr', x: false, i: 16 },
-  { v: false, n: 'heating pump', s: 'heatingpump', x: false, i: 17 },
-  { v: false, n: 'fan', s: 'fanwork', x: false, i: 18 },
-  { v: false, n: 'ignition', s: 'ignwork', x: false, i: 19 },
-  { v: false, n: 'oil preheating', s: 'oilpreheat', x: false, i: 20 },
-  { v: true, n: 'heating activated', s: 'heatingactivated', x: false, i: 21 },
-  { v: 80, n: 'heating temperature', s: 'heatingtemp', x: false, i: 22 },
-  { v: 70, n: 'burner pump max power', s: 'pumpmodmax', x: false, i: 23 },
-  { v: 30, n: 'burner pump min power', s: 'pumpmodmin', x: false, i: 24 },
-  { v: 1, n: 'pump delay', s: 'pumpdelay', x: false, i: 25 },
-  { v: 10, n: 'burner min period', s: 'burnminperiod', x: false, i: 26 },
-  { v: 0, n: 'burner min power', s: 'burnminpower', x: false, i: 27 },
-  { v: 50, n: 'burner max power', s: 'burnmaxpower', x: false, i: 28 },
-  { v: -6, n: 'hysteresis on temperature', s: 'boilhyston', x: false, i: 29 },
-  { v: 6, n: 'hysteresis off temperature', s: 'boilhystoff', x: false, i: 30 },
-  { v: 0, n: 'set flow temperature', s: 'setflowtemp', x: false, i: 31 },
-  { v: 0, n: 'burner set power', s: 'setburnpow', x: false, i: 32 },
-  { v: 0, n: 'burner current power', s: 'curburnpow', x: false, i: 33 },
-  { v: 326323, n: 'burner starts', s: 'burnstarts', x: false, i: 34 },
-  { v: 553437, n: 'total burner operating time', s: 'burnworkmin', x: false, i: 35 },
-  { v: 451286, n: 'total heat operating time', s: 'heatworkmin', x: false, i: 36 },
-  { v: 4672175, n: 'total UBA operating time', s: 'ubauptime', x: false, i: 37 },
-  { v: '1C(210) 06.06.2020 12:07 (0 min)', n: 'last error code', s: 'lastcode', x: false, i: 38 },
-  { v: '0H', n: 'service code', s: 'servicecode', x: false, i: 39 },
-  { v: 203, n: 'service code number', s: 'servicecodenumber', x: false, i: 40 },
-  { v: 'H00', n: 'maintenance message', s: 'maintenancemessage', x: false, i: 41 },
-  { v: 'manual', n: 'maintenance scheduled', s: 'maintenance', x: false, i: 42 },
-  { v: 6000, n: 'time to next maintenance', s: 'maintenancetime', x: false, i: 43 },
-  { v: '01.01.2012', n: 'next maintenance date', s: 'maintenancedate', x: false, i: 44 },
-  { v: true, n: 'dhw turn on/off', s: 'wwtapactivated', x: false, i: 45 },
-  { v: 62, n: 'dhw set temperature', s: 'wwsettemp', x: false, i: 46 },
-  { v: 60, n: 'dhw selected temperature', s: 'wwseltemp', x: false, i: 47 },
-  { n: 'dhw selected lower temperature', s: 'wwseltemplow', x: true, i: 48 },
-  { n: 'dhw selected temperature for off', s: 'wwseltempoff', x: true, i: 49 },
-  { n: 'dhw single charge temperature', s: 'wwseltempsingle', x: true, i: 50 },
-  { v: 'flow', n: 'dhw type', s: 'wwtype', x: false, i: 51 },
-  { v: 'hot', n: 'dhw comfort', s: 'wwcomfort', x: false, i: 52 },
-  { v: 40, n: 'dhw flow temperature offset', s: 'wwflowtempoffset', x: false, i: 53 },
-  { v: 100, n: 'dhw max power', s: 'wwmaxpower', x: false, i: 54 },
-  { v: false, n: 'dhw circulation pump available', s: 'wwcircpump', x: false, i: 55 },
-  { v: '3-way valve', n: 'dhw charging type', s: 'wwchargetype', x: false, i: 56 },
-  { v: -5, n: 'dhw hysteresis on temperature', s: 'wwhyston', x: false, i: 57 },
-  { v: 0, n: 'dhw hysteresis off temperature', s: 'wwhystoff', x: false, i: 58 },
-  { v: 70, n: 'dhw disinfection temperature', s: 'wwdisinfectiontemp', x: false, i: 59 },
-  { v: 'off', n: 'dhw circulation pump mode', s: 'wwcircmode', x: false, i: 60 },
-  { v: false, n: 'dhw circulation active', s: 'wwcirc', x: false, i: 61 },
-  { v: 46.4, n: 'dhw current intern temperature', s: 'wwcurtemp', x: false, i: 62 },
-  { n: 'dhw current extern temperature', s: 'wwcurtemp2', x: true, i: 63 },
-  { v: 0, n: 'dhw current tap water flow', s: 'wwcurflow', x: false, i: 64 },
-  { v: 46.3, n: 'dhw storage intern temperature', s: 'wwstoragetemp1', x: false, i: 65 },
-  { n: 'dhw storage extern temperature', s: 'wwstoragetemp2', x: true, i: 66 },
-  { v: true, n: 'dhw activated', s: 'wwactivated', x: false, i: 67 },
-  { v: false, n: 'dhw one time charging', s: 'wwonetime', x: false, i: 68 },
-  { v: false, n: 'dhw disinfecting', s: 'wwdisinfecting', x: false, i: 69 },
-  { v: false, n: 'dhw charging', s: 'wwcharging', x: false, i: 70 },
-  { v: false, n: 'dhw recharging', s: 'wwrecharging', x: false, i: 71 },
-  { v: true, n: 'dhw temperature ok', s: 'wwtempok', x: false, i: 72 },
-  { v: false, n: 'dhw active', s: 'wwactive', x: false, i: 73 },
-  { v: true, n: 'dhw 3way valve active', s: 'ww3wayvalve', x: false, i: 74 },
-  { v: 0, n: 'dhw set pump power', s: 'wwsetpumppower', x: false, i: 75 },
-  { n: 'dhw mixer temperature', s: 'wwmixertemp', x: true, i: 76 },
-  { n: 'dhw cylinder middle temperature (TS3)', s: 'wwcylmiddletemp', x: true, i: 77 },
-  { v: 288768, n: 'dhw starts', s: 'wwstarts', x: false, i: 78 },
-  { v: 102151, n: 'dhw active time', s: 'wwworkm', x: false, i: 79 },
+  { v: false, n: 'heating active', s: 'heatingactive', m: 0, i: 1 },
+  { v: false, n: 'tapwater active', s: 'tapwateractive', m: 0, i: 2 },
+  { v: 5, n: 'selected flow temperature', s: 'selflowtemp', m: 0, i: 3 },
+  { v: 0, n: 'burner selected max power', s: 'selburnpow', m: 0, i: 4 },
+  { v: 0, n: 'heating pump modulation', s: 'heatingpumpmod', m: 0, i: 5 },
+  { n: 'heating pump 2 modulation', s: 'heatingpump2mod', m: 7, i: 6 },
+  { n: 'outside temperature', s: 'outdoortemp', m: 7, i: 7 },
+  { v: 53, n: 'current flow temperature', s: 'curflowtemp', m: 0, i: 8 },
+  { v: 51.8, n: 'return temperature', s: 'rettemp', m: 0, i: 9 },
+  { n: 'mixing switch temperature', s: 'switchtemp', m: 7, i: 10 },
+  { v: 1.3, n: 'system pressure', s: 'syspress', m: 0, i: 11 },
+  { v: 54.6, n: 'actual boiler temperature', s: 'boiltemp', m: 0, i: 12 },
+  { n: 'exhaust temperature', s: 'exhausttemp', m: 7, i: 13 },
+  { v: false, n: 'gas', s: 'burngas', m: 0, i: 14 },
+  { v: false, n: 'gas stage 2', s: 'burngas2', m: 0, i: 15 },
+  { v: 0, n: 'flame current', s: 'flamecurr', m: 0, i: 16 },
+  { v: false, n: 'heating pump', s: 'heatingpump', m: 0, i: 17 },
+  { v: false, n: 'fan', s: 'fanwork', m: 0, i: 18 },
+  { v: false, n: 'ignition', s: 'ignwork', m: 0, i: 19 },
+  { v: false, n: 'oil preheating', s: 'oilpreheat', m: 0, i: 20 },
+  { v: true, n: 'heating activated', s: 'heatingactivated', m: 0, i: 21 },
+  { v: 80, n: 'heating temperature', s: 'heatingtemp', m: 0, i: 22 },
+  { v: 70, n: 'burner pump max power', s: 'pumpmodmax', m: 0, i: 23 },
+  { v: 30, n: 'burner pump min power', s: 'pumpmodmin', m: 0, i: 24 },
+  { v: 1, n: 'pump delay', s: 'pumpdelay', m: 0, i: 25 },
+  { v: 10, n: 'burner min period', s: 'burnminperiod', m: 0, i: 26 },
+  { v: 0, n: 'burner min power', s: 'burnminpower', m: 0, i: 27 },
+  { v: 50, n: 'burner max power', s: 'burnmaxpower', m: 0, i: 28 },
+  { v: -6, n: 'hysteresis on temperature', s: 'boilhyston', m: 0, i: 29 },
+  { v: 6, n: 'hysteresis off temperature', s: 'boilhystoff', m: 0, i: 30 },
+  { v: 0, n: 'set flow temperature', s: 'setflowtemp', m: 0, i: 31 },
+  { v: 0, n: 'burner set power', s: 'setburnpow', m: 0, i: 32 },
+  { v: 0, n: 'burner current power', s: 'curburnpow', m: 0, i: 33 },
+  { v: 326323, n: 'burner starts', s: 'burnstarts', m: 0, i: 34 },
+  { v: 553437, n: 'total burner operating time', s: 'burnworkmin', m: 0, i: 35 },
+  { v: 451286, n: 'total heat operating time', s: 'heatworkmin', m: 0, i: 36 },
+  { v: 4672175, n: 'total UBA operating time', s: 'ubauptime', m: 0, i: 37 },
+  { v: '1C(210) 06.06.2020 12:07 (0 min)', n: 'last error code', s: 'lastcode', m: 0, i: 38 },
+  { v: '0H', n: 'service code', s: 'servicecode', m: 0, i: 39 },
+  { v: 203, n: 'service code number', s: 'servicecodenumber', m: 0, i: 40 },
+  { v: 'H00', n: 'maintenance message', s: 'maintenancemessage', m: 0, i: 41 },
+  { v: 'manual', n: 'maintenance scheduled', s: 'maintenance', m: 0, i: 42 },
+  { v: 6000, n: 'time to next maintenance', s: 'maintenancetime', m: 0, i: 43 },
+  { v: '01.01.2012', n: 'next maintenance date', s: 'maintenancedate', m: 0, i: 44 },
+  { v: true, n: 'dhw turn on/off', s: 'wwtapactivated', m: 0, i: 45 },
+  { v: 62, n: 'dhw set temperature', s: 'wwsettemp', m: 0, i: 46 },
+  { v: 60, n: 'dhw selected temperature', s: 'wwseltemp', m: 0, i: 47 },
+  { n: 'dhw selected lower temperature', s: 'wwseltemplow', m: 7, i: 48 },
+  { n: 'dhw selected temperature for off', s: 'wwseltempoff', m: 7, i: 49 },
+  { n: 'dhw single charge temperature', s: 'wwseltempsingle', m: 7, i: 50 },
+  { v: 'flow', n: 'dhw type', s: 'wwtype', m: 0, i: 51 },
+  { v: 'hot', n: 'dhw comfort', s: 'wwcomfort', m: 0, i: 52 },
+  { v: 40, n: 'dhw flow temperature offset', s: 'wwflowtempoffset', m: 0, i: 53 },
+  { v: 100, n: 'dhw max power', s: 'wwmaxpower', m: 0, i: 54 },
+  { v: false, n: 'dhw circulation pump available', s: 'wwcircpump', m: 0, i: 55 },
+  { v: '3-way valve', n: 'dhw charging type', s: 'wwchargetype', m: 0, i: 56 },
+  { v: -5, n: 'dhw hysteresis on temperature', s: 'wwhyston', m: 0, i: 57 },
+  { v: 0, n: 'dhw hysteresis off temperature', s: 'wwhystoff', m: 0, i: 58 },
+  { v: 70, n: 'dhw disinfection temperature', s: 'wwdisinfectiontemp', m: 0, i: 59 },
+  { v: 'off', n: 'dhw circulation pump mode', s: 'wwcircmode', m: 0, i: 60 },
+  { v: false, n: 'dhw circulation active', s: 'wwcirc', m: 0, i: 61 },
+  { v: 46.4, n: 'dhw current intern temperature', s: 'wwcurtemp', m: 0, i: 62 },
+  { n: 'dhw current extern temperature', s: 'wwcurtemp2', m: 7, i: 63 },
+  { v: 0, n: 'dhw current tap water flow', s: 'wwcurflow', m: 0, i: 64 },
+  { v: 46.3, n: 'dhw storage intern temperature', s: 'wwstoragetemp1', m: 0, i: 65 },
+  { n: 'dhw storage extern temperature', s: 'wwstoragetemp2', m: 7, i: 66 },
+  { v: true, n: 'dhw activated', s: 'wwactivated', m: 0, i: 67 },
+  { v: false, n: 'dhw one time charging', s: 'wwonetime', m: 0, i: 68 },
+  { v: false, n: 'dhw disinfecting', s: 'wwdisinfecting', m: 0, i: 69 },
+  { v: false, n: 'dhw charging', s: 'wwcharging', m: 0, i: 70 },
+  { v: false, n: 'dhw recharging', s: 'wwrecharging', m: 0, i: 71 },
+  { v: true, n: 'dhw temperature ok', s: 'wwtempok', m: 0, i: 72 },
+  { v: false, n: 'dhw active', s: 'wwactive', m: 0, i: 73 },
+  { v: true, n: 'dhw 3way valve active', s: 'ww3wayvalve', m: 0, i: 74 },
+  { v: 0, n: 'dhw set pump power', s: 'wwsetpumppower', m: 0, i: 75 },
+  { n: 'dhw mixer temperature', s: 'wwmixertemp', m: 7, i: 76 },
+  { n: 'dhw cylinder middle temperature (TS3)', s: 'wwcylmiddletemp', m: 7, i: 77 },
+  { v: 288768, n: 'dhw starts', s: 'wwstarts', m: 0, i: 78 },
+  { v: 102151, n: 'dhw active time', s: 'wwworkm', m: 0, i: 79 },
 ]
 
 const emsesp_deviceentities_4 = [
@@ -718,20 +718,20 @@ const emsesp_deviceentities_4 = [
     v: 16,
     n: 'hc2 selected room temperature',
     s: 'hc2/seltemp',
-    x: false,
+    m: 0,
     i: 1,
   },
   {
     n: 'hc2 current room temperature',
     s: 'hc2/curtemp',
-    x: true,
+    m: 7,
     i: 2,
   },
   {
     v: 'off',
     n: 'hc2 mode',
     s: 'hc2/mode',
-    x: true,
+    m: 7,
     i: 3,
   },
 ]
@@ -925,8 +925,8 @@ rest_server.post(EMSESP_DEVICEENTITIES_ENDPOINT, (req, res) => {
   }
 })
 
-rest_server.post(EMSESP_EXCLUDE_ENTITIES_ENDPOINT, (req, res) => {
-  console.log('exclude list for unique id ' + req.body.id + ' and entities:')
+rest_server.post(EMSESP_MASKED_ENTITIES_ENDPOINT, (req, res) => {
+  console.log('list for unique id ' + req.body.id + ' and entities:')
   console.log(req.body.entity_ids)
   res.sendStatus(200)
 })