diff --git a/src/emsdevice.cpp b/src/emsdevice.cpp
index 6851ed9e4..81c4ce5f5 100644
--- a/src/emsdevice.cpp
+++ b/src/emsdevice.cpp
@@ -587,7 +587,7 @@ bool EMSdevice::generate_values_json(JsonObject & root, const uint8_t tag_filter
                 // if we have a tag, and its different to the last one create a nested object
                 if (dv.tag != old_tag) {
                     old_tag = dv.tag;
-                    if (nested && have_tag) {
+                    if (nested && have_tag && dv.tag >= DeviceValueTAG::TAG_HC1) { // no nests for boiler tags
                         json = root.createNestedObject(tag_to_string(dv.tag));
                     }
                 }
diff --git a/src/emsesp.cpp b/src/emsesp.cpp
index 600b8c82f..046b47181 100644
--- a/src/emsesp.cpp
+++ b/src/emsesp.cpp
@@ -926,7 +926,7 @@ bool EMSESP::command_info(uint8_t device_type, JsonObject & json, const int8_t i
 
     for (const auto & emsdevice : emsdevices) {
         if (emsdevice && (emsdevice->device_type() == device_type) && ((device_type != DeviceType::THERMOSTAT) || (emsdevice->device_id() == EMSESP::actual_master_thermostat()))) {
-            has_value |= emsdevice->generate_values_json(json, tag, (id == -1), true); // console & nested
+            has_value |= emsdevice->generate_values_json(json, tag, (id < 1), (id == -1)); // nested for id -1,0 & console for id -1
         }
     }
 
@@ -1124,8 +1124,8 @@ void EMSESP::loop() {
     system_.loop();       // does LED and checks system health, and syslog service
     rxservice_.loop();    // process any incoming Rx telegrams
     shower_.loop();       // check for shower on/off
-    dallassensor_.loop(); // this will also send out via MQTT
-    publish_all_loop();   // See which topics need publishing to MQTT and queue them
+    dallassensor_.loop(); // read dallas sensor temperatures
+    publish_all_loop();   // with HA messages in parts to avoid flooding the mqtt queue
     mqtt_.loop();         // sends out anything in the MQTT queue
     console_.loop();      // telnet/serial console