diff --git a/src/CHANGES.md b/src/CHANGES.md
index a4d12226..9f83f7e7 100644
--- a/src/CHANGES.md
+++ b/src/CHANGES.md
@@ -1,5 +1,9 @@
 # Development Changes
 
+## 0.6.12 - 2023-04-28
+* improved MqTT
+* fix menu active item
+
 ## 0.6.11 - 2023-04-27
 * added MqTT class for publishing all values in Arduino `loop`
 
diff --git a/src/defines.h b/src/defines.h
index 7260d766..cf9395d5 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -13,7 +13,7 @@
 //-------------------------------------
 #define VERSION_MAJOR       0
 #define VERSION_MINOR       6
-#define VERSION_PATCH       11
+#define VERSION_PATCH       12
 
 //-------------------------------------
 typedef struct {
diff --git a/src/publisher/pubMqttIvData.h b/src/publisher/pubMqttIvData.h
index ba4cbbbf..947cd2f4 100644
--- a/src/publisher/pubMqttIvData.h
+++ b/src/publisher/pubMqttIvData.h
@@ -92,8 +92,10 @@ class PubMqttIvData {
                 mState = SEND_DATA;
             else if(mSendTotals)
                 mState = SEND_TOTALS;
-            else
-                mState = IDLE;
+            else {
+                mSendList->pop();
+                mState = START;
+            }
         }
 
         void stateSend() {
diff --git a/src/web/html/api.js b/src/web/html/api.js
index 13ca50b5..1dd5422e 100644
--- a/src/web/html/api.js
+++ b/src/web/html/api.js
@@ -78,7 +78,7 @@ function parseNav(obj) {
         if(i == 2)
             continue;
         var l = document.getElementById("nav"+i);
-        if(window.location.pathname == "/" + l.href.split('/').pop())
+        if(window.location.pathname == "/" + l.href.substring(0, l.href.indexOf("?")).split('/').pop())
             l.classList.add("active");
 
         if(obj["menu_protEn"]) {