diff --git a/src/html/index.html b/src/html/index.html
index f5e10b5..e953acc 100644
--- a/src/html/index.html
+++ b/src/html/index.html
@@ -12,7 +12,7 @@
               {{info.service.name}} - {{info.service.version}} -
               {{info.service.sha.substring(0, 7)}} - {{info.service.build_date.substring(0, 10)}}<br/>
               By: {{formatAuthors(info.service.authors)}}<br />
-              Check the <a href="/v1/mavlink">mavlink path</a> for the data<br />
+              Check the <a href="v1/mavlink">mavlink path</a> for the data<br />
               You can also check nested paths:
               <a href="v1/mavlink/vehicles/1/components/1/messages/HEARTBEAT/message/mavtype/type"
                 >mavlink/vehicles/{system_id}/components/{component_id}/messages/HEARTBEAT/message/mavtype/type</a
diff --git a/src/html/watcher.html b/src/html/watcher.html
index d772bf1..2e2892f 100644
--- a/src/html/watcher.html
+++ b/src/html/watcher.html
@@ -73,13 +73,15 @@
             if (this.messageName !== undefined && jsonData.message.type !== this.messageName) {
               return
             }
-            if (path !== []) {
-              jsonData = path.reduce((a, b)=> a[b], jsonData)
+
+            jsonData = path.reduce((a, b)=> a[b], jsonData)
+            if ('header' in jsonData && 'message' in jsonData) {
+              this.setMessage(jsonData.message)
+            } else {
+              this.setMessage(jsonData)
             }
 
             this.time = new Date()
-            delete jsonData.header
-            this.setMessage(jsonData.message)
           };
 
           this.socket.onclose = (event) => {