diff --git a/controller/report/report_admin_controller.go b/controller/report/report_admin_controller.go
index ae880be..02a15e3 100644
--- a/controller/report/report_admin_controller.go
+++ b/controller/report/report_admin_controller.go
@@ -787,7 +787,9 @@ function renderQueryUI() {
   let indHtml = '';
   for (const d of f.indicators) {
     const sel = queryCtx.indicators.find(i => i.fieldCode === d.fieldCode);
-    indHtml += '<span class="chip'+(sel?' selected':'')+'" onclick="toggleInd(\''+jsAttr(d.fieldCode)+'\', \''+jsAttr(d.defaultAggregate||'SUM')+'\', \''+jsAttr(d.fieldName||d.fieldCode)+'\')">'+esc(d.fieldName||d.fieldCode)+(d.unit?'('+d.unit+')':'')+'</span>';
+    const fn = esc(d.fieldName||d.fieldCode);
+    const unitSuffix = d.unit && fn.indexOf('('+d.unit+')') === -1 ? '('+d.unit+')' : '';
+    indHtml += '<span class="chip'+(sel?' selected':'')+'" onclick="toggleInd(\''+jsAttr(d.fieldCode)+'\', \''+jsAttr(d.defaultAggregate||'SUM')+'\', \''+jsAttr(d.fieldName||d.fieldCode)+'\')">'+fn+unitSuffix+'</span>';
   }
   document.getElementById('indicator-area').innerHTML = indHtml;
   renderSelectedIndicators();