diff --git a/lighthub/main.cpp b/lighthub/main.cpp
index 70ae064..5eccc05 100644
--- a/lighthub/main.cpp
+++ b/lighthub/main.cpp
@@ -170,6 +170,7 @@ void mqttCallback(char *topic, byte *payload, unsigned int length) {
 
         Item item(subtopic);
         if (item.isValid()) {
+           if (item.itemType==CH_GROUP && retaining) return; //Do not restore group channels - they consist not relevant data
             switch (cmd) {
                 case 0: {
                     short i = 0;
@@ -885,14 +886,7 @@ void printFirmwareVersionAndBuildOptions() {
     Serial.print(F("Config server:"));
     Serial.println(F(CONFIG_SERVER));
     Serial.print(F("Firmware MAC Address "));
-#ifdef DEFAULT_FIRMWARE_MAC
-    Serial.println(F(Q(DEFAULT_FIRMWARE_MAC)));
-#endif
-#ifdef CUSTOM_FIRMWARE_MAC
-    Serial.println(F(QUOTE(CUSTOM_FIRMWARE_MAC)));
-#endif
-    printMACAddress();
-
+    Serial.println(F(QUOTE(CUSTOM_FIRMWARE_MAC)));   
 #ifdef DISABLE_FREERAM_PRINT
     Serial.println(F("(-)FreeRam printing"));
 #else
@@ -903,13 +897,9 @@ void printFirmwareVersionAndBuildOptions() {
 }
 
 void setupMacAddress() {
-#ifdef DEFAULT_FIRMWARE_MAC
-    byte firmwareMacAddress[6] = DEFAULT_FIRMWARE_MAC;
-#else
     byte firmwareMacAddress[6];
     const char *macStr = QUOTE(CUSTOM_FIRMWARE_MAC);
     parseBytes(macStr, ':', firmwareMacAddress, 6, 16);
-#endif
 
     bool isMacValid = false;
     for (short i = 0; i < 6; i++) {
diff --git a/lighthub/options.h b/lighthub/options.h
index a3d1cb7..d262f65 100644
--- a/lighthub/options.h
+++ b/lighthub/options.h
@@ -1,6 +1,6 @@
 // Configuration of drivers enabled
 #ifndef PIO_SRC_REV
-#define PIO_SRC_REV v0.99
+#define PIO_SRC_REV v0.99.1
 #endif
 
 #define TXEnablePin 13
@@ -26,7 +26,7 @@
 #endif
 
 #ifndef CUSTOM_FIRMWARE_MAC
-#define DEFAULT_FIRMWARE_MAC {0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0}
+#define CUDTOM_FIRMWARE_MAC {0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0}
 #endif