diff --git a/src/trx-client/trx-frontend/trx-frontend-http/assets/web/app.js b/src/trx-client/trx-frontend/trx-frontend-http/assets/web/app.js
index ba4d90e..9f80fe7 100644
--- a/src/trx-client/trx-frontend/trx-frontend-http/assets/web/app.js
+++ b/src/trx-client/trx-frontend/trx-frontend-http/assets/web/app.js
@@ -4444,7 +4444,14 @@ function navigateToTab(name, options = {}) {
   document.querySelectorAll(".tab-bar .tab").forEach((t) => t.classList.remove("active"));
   btn.classList.add("active");
   document.querySelectorAll(".tab-panel").forEach((p) => p.style.display = "none");
-  document.getElementById(`tab-${name}`).style.display = "";
+  const panel = document.getElementById(`tab-${name}`);
+  panel.style.display = "";
+  // Clone deferred <template> content into the panel before any tab-specific init.
+  const tmpl = panel.querySelector("template");
+  if (tmpl) {
+    panel.appendChild(tmpl.content.cloneNode(true));
+    tmpl.remove();
+  }
   if (updateHistory) {
     updateTabHistory(name, replaceHistory);
   }
diff --git a/src/trx-client/trx-frontend/trx-frontend-http/assets/web/index.html b/src/trx-client/trx-frontend/trx-frontend-http/assets/web/index.html
index 77610dc..03e75fa 100644
--- a/src/trx-client/trx-frontend/trx-frontend-http/assets/web/index.html
+++ b/src/trx-client/trx-frontend/trx-frontend-http/assets/web/index.html
@@ -1655,21 +1655,7 @@
   window.loadPluginsForTab = loadPlugins;
 })();
   </script>
-  <script>
-(function() {
-  document.addEventListener('click', function(e) {
-    var tab = e.target.closest('[data-tab]');
-    if (!tab) return;
-    var panel = document.getElementById('tab-' + tab.dataset.tab);
-    if (!panel) return;
-    var tmpl = panel.querySelector('template');
-    if (tmpl) {
-      panel.appendChild(tmpl.content.cloneNode(true));
-      tmpl.remove();
-    }
-  });
-})();
-  </script>
+  <!-- Template cloning is handled by navigateToTab() in app.js -->
   <script defer src="/vendor/leaflet.js"></script>
 </body>
 </html>
diff --git a/src/trx-client/trx-frontend/trx-frontend-http/assets/web/map-core.js b/src/trx-client/trx-frontend/trx-frontend-http/assets/web/map-core.js
index b3b433a..ff77cd5 100644
--- a/src/trx-client/trx-frontend/trx-frontend-http/assets/web/map-core.js
+++ b/src/trx-client/trx-frontend/trx-frontend-http/assets/web/map-core.js
@@ -3178,11 +3178,33 @@
   }
 
   let _statsRenderPending = false;
+  let _statsControlsWired = false;
+  function _wireStatsControls() {
+    if (_statsControlsWired) return;
+    const rigEl = document.getElementById("stats-rig-filter");
+    const histEl = document.getElementById("stats-history-limit");
+    if (!rigEl && !histEl) return; // template not yet cloned
+    _statsControlsWired = true;
+    if (rigEl) {
+      rigEl.addEventListener("change", () => {
+        statsRigFilter = rigEl.value;
+        scheduleStatsRender();
+      });
+    }
+    if (histEl) {
+      histEl.value = String(statsHistoryLimitMinutes);
+      histEl.addEventListener("change", () => {
+        statsHistoryLimitMinutes = Number(histEl.value) || 1440;
+        scheduleStatsRender();
+      });
+    }
+  }
   function scheduleStatsRender() {
     if (_statsRenderPending) return;
     _statsRenderPending = true;
     requestAnimationFrame(() => {
       _statsRenderPending = false;
+      _wireStatsControls();
       renderStatsCounters();
       renderStatsDecodeTypes();
       renderStatsBandActivity();
@@ -3194,25 +3216,6 @@
     });
   }
 
-  // Wire up statistics panel controls
-  (function() {
-    const rigEl = document.getElementById("stats-rig-filter");
-    if (rigEl) {
-      rigEl.addEventListener("change", () => {
-        statsRigFilter = rigEl.value;
-        scheduleStatsRender();
-      });
-    }
-    const histEl = document.getElementById("stats-history-limit");
-    if (histEl) {
-      histEl.value = String(statsHistoryLimitMinutes);
-      histEl.addEventListener("change", () => {
-        statsHistoryLimitMinutes = Number(histEl.value) || 1440;
-        scheduleStatsRender();
-      });
-    }
-  })();
-
   function buildBookmarkLocatorPopupHtml(grid, bookmarks) {
     const list = Array.isArray(bookmarks) ? bookmarks : [];
     const rows = list