diff --git a/src/devices/connect.cpp b/src/devices/connect.cpp
index 04446c8c2..07fb346c7 100644
--- a/src/devices/connect.cpp
+++ b/src/devices/connect.cpp
@@ -31,7 +31,7 @@ Connect::Connect(uint8_t device_type, uint8_t device_id, uint8_t product_id, con
     // register_telegram_type(EMS_TYPE_XX, "XX", false, std::bind(&Controller::process_XX, this, _1));
 
     // MQTT callbacks
-    // register_mqtt_topic("cmd", std::bind(&Connect::cmd, this, _1));
+    // register_mqtt_topic("topic", std::bind(&Connect::cmd, this, _1));
 }
 
 void Connect::add_context_menu() {
diff --git a/src/devices/controller.cpp b/src/devices/controller.cpp
index 1a48381f3..c7d5727e9 100644
--- a/src/devices/controller.cpp
+++ b/src/devices/controller.cpp
@@ -33,7 +33,7 @@ Controller::Controller(uint8_t device_type, uint8_t device_id, uint8_t product_i
     // register_telegram_type(EMS_TYPE_XX, "XX", false, std::bind(&Controller::process_XX, this, _1));
 
     // MQTT callbacks
-    // register_mqtt_topic("cmd", std::bind(&Controller::cmd, this, _1));
+    // register_mqtt_topic("topic", std::bind(&Controller::cmd, this, _1));
 }
 
 void Controller::add_context_menu() {
diff --git a/src/devices/gateway.cpp b/src/devices/gateway.cpp
index c256a53b6..101791f1d 100644
--- a/src/devices/gateway.cpp
+++ b/src/devices/gateway.cpp
@@ -33,7 +33,7 @@ Gateway::Gateway(uint8_t device_type, uint8_t device_id, uint8_t product_id, con
     // register_telegram_type(EMS_TYPE_XX, "XX", false, std::bind(&Controller::process_XX, this, _1));
 
     // MQTT callbacks
-    // register_mqtt_topic("cmd", std::bind(&Gateway::cmd, this, _1));
+    // register_mqtt_topic("topic", std::bind(&Gateway::cmd, this, _1));
 }
 
 void Gateway::add_context_menu() {
diff --git a/src/devices/heatpump.cpp b/src/devices/heatpump.cpp
index aa5df273a..fec97a61d 100644
--- a/src/devices/heatpump.cpp
+++ b/src/devices/heatpump.cpp
@@ -43,7 +43,7 @@ Heatpump::Heatpump(uint8_t device_type, uint8_t device_id, uint8_t product_id, c
     register_telegram_type(0x042B, F("HP2"), true, std::bind(&Heatpump::process_HPMonitor2, this, _1));
 
     // MQTT callbacks
-    // register_mqtt_topic("cmd", std::bind(&Heatpump::cmd, this, _1));
+    // register_mqtt_topic("topic", std::bind(&Heatpump::cmd, this, _1));
 }
 
 // context submenu
diff --git a/src/devices/mixing.cpp b/src/devices/mixing.cpp
index 322fb9d28..52938aff7 100644
--- a/src/devices/mixing.cpp
+++ b/src/devices/mixing.cpp
@@ -50,7 +50,7 @@ Mixing::Mixing(uint8_t device_type, uint8_t device_id, uint8_t product_id, const
     }
 
     // MQTT callbacks
-    // register_mqtt_topic("cmd", std::bind(&Mixing::cmd, this, _1));
+    // register_mqtt_topic("topic", std::bind(&Mixing::cmd, this, _1));
 }
 
 // add context submenu
diff --git a/src/devices/solar.cpp b/src/devices/solar.cpp
index 09bb61763..feb2987c0 100644
--- a/src/devices/solar.cpp
+++ b/src/devices/solar.cpp
@@ -51,7 +51,7 @@ Solar::Solar(uint8_t device_type, uint8_t device_id, uint8_t product_id, const s
     }
 
     // MQTT callbacks
-    // register_mqtt_topic("cmd", std::bind(&Solar::cmd, this, _1));
+    // register_mqtt_topic("topic", std::bind(&Solar::cmd, this, _1));
 }
 
 // context submenu
@@ -103,11 +103,11 @@ void Solar::publish_values() {
         doc["pumpmodulation"] = pumpModulation_;
     }
 
-    if (Helpers::hasValue(pump_, true)) {
+    if (Helpers::hasValue(pump_, VALUE_BOOL)) {
         doc["pump"] = Helpers::render_value(s, pump_, EMS_VALUE_BOOL);
     }
 
-    if (Helpers::hasValue(valveStatus_, true)) {
+    if (Helpers::hasValue(valveStatus_, VALUE_BOOL)) {
         doc["valvestatus"] = Helpers::render_value(s, valveStatus_, EMS_VALUE_BOOL);
     }
 
@@ -115,11 +115,11 @@ void Solar::publish_values() {
         doc["pumpWorkMin"] = (float)pumpWorkMin_;
     }
 
-    if (Helpers::hasValue(tankHeated_, true)) {
+    if (Helpers::hasValue(tankHeated_, VALUE_BOOL)) {
         doc["tankHeated"] = Helpers::render_value(s, tankHeated_, EMS_VALUE_BOOL);
     }
 
-    if (Helpers::hasValue(collectorOnOff_, true)) {
+    if (Helpers::hasValue(collectorOnOff_, VALUE_BOOL)) {
         doc["collectorOnOff"] = Helpers::render_value(s, collectorOnOff_, EMS_VALUE_BOOL);
     }
 
diff --git a/src/devices/switch.cpp b/src/devices/switch.cpp
index a88ccd146..f86858fff 100644
--- a/src/devices/switch.cpp
+++ b/src/devices/switch.cpp
@@ -33,7 +33,7 @@ Switch::Switch(uint8_t device_type, uint8_t device_id, uint8_t product_id, const
     // register_telegram_type(EMS_TYPE_XX, "XX", false, std::bind(&Controller::process_XX, this, _1));
 
     // MQTT callbacks
-    // register_mqtt_topic("cmd", std::bind(&Switch::cmd, this, _1));
+    // register_mqtt_topic("topic", std::bind(&Switch::cmd, this, _1));
 }
 
 void Switch::add_context_menu() {
diff --git a/src/test/test.cpp b/src/test/test.cpp
index d29bd0871..03a1de80c 100644
--- a/src/test/test.cpp
+++ b/src/test/test.cpp
@@ -542,9 +542,8 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & command) {
     }
 
     if (command == "mqtt2") {
-        // Mqtt::subscribe("cmd", std::bind(&EMSESP::dummy_EMSESP::mqtt_commands, this, _1));
         for (uint8_t i = 0; i < 30; i++) {
-            Mqtt::subscribe("cmd", dummy_mqtt_commands);
+            Mqtt::subscribe("topic", dummy_mqtt_commands);
         }
     }