diff --git a/html/webpage/assets/js/messagebank.js b/html/webpage/assets/js/messagebank.js
index 186fa17..6ee12e2 100644
--- a/html/webpage/assets/js/messagebank.js
+++ b/html/webpage/assets/js/messagebank.js
@@ -105,8 +105,8 @@ $(document).ready(function () {
         categories.forEach(cat => {
             if ("Phrase" === cat) return; // skip Phrase category
             if ("Airline_Code" === cat) cat = "Flight_Number"; // revisi 15012026 karena inconsistensi penamaan tag
-            let displayCat = `[${cat}]`;
-            $messageavailablevariables.append(new Option(text=displayCat.toUpperCase(), value=displayCat.toUpperCase()));
+            let displayCat = `[${cat}]`.toUpperCase();
+            $messageavailablevariables.append(new Option(text=displayCat, value=displayCat));
         });
         // tambah [ETAD], [BCB]  revisi 19012026
         $messageavailablevariables.append(new Option(text='[ETAD]', value='[ETAD]'));
@@ -121,7 +121,10 @@ $(document).ready(function () {
                         //console.log(JSON.stringify(okdata));
                         okdata.forEach(sb => {
                             if (sb.description && sb.description.length > 0) {
-                                $messageavailablevariables.append($('<option>', { value: sb.tag.toUpperCase(), text: sb.description, title: sb.description }));
+                                let v1 = sb.tag.toUpperCase();
+                                let t1 = sb.description+` [${v1}]`;
+                                let t2 = sb.description;
+                                $messageavailablevariables.append($('<option>', { value: v1, text: t1, title: t2 }));
                             }
                         });
                         if (cbLoaded && typeof cbLoaded === 'function') {
@@ -373,7 +376,7 @@ $(document).ready(function () {
                     if (mb.message_TAGS && mb.message_TAGS.length > 0) {
                         let tags = mb.message_TAGS.split(" ");
                         tags.forEach((tag, idx) => {
-                            console.log(`Restoring tag[${idx}]: ${tag}`);
+                            //console.log(`Restoring tag[${idx}]: ${tag}`);
                             let tagLower = tag.toLowerCase();
                             let isfound = false;
                             if (tagLower==="[airline_code]") {
@@ -392,11 +395,11 @@ $(document).ready(function () {
                                     $messageselectedvariables.append($(this).clone());
                                 }
                             });
-                            if (isfound) {
-                                console.log(`Appended tag to selected variables: ${tag}`);
-                            } else {
-                                console.log(`Tag not found in available variables: ${tag}`);
-                            }
+                            // if (isfound) {
+                            //     console.log(`Appended tag to selected variables: ${tag}`);
+                            // } else {
+                            //     console.log(`Tag not found in available variables: ${tag}`);
+                            // }
                         });
                     }
                 }
diff --git a/html/webpage/broadcastzones.html b/html/webpage/broadcastzones.html
index bbaf60a..5cb7fe9 100644
--- a/html/webpage/broadcastzones.html
+++ b/html/webpage/broadcastzones.html
@@ -246,8 +246,8 @@
                                             <th class="class05">No</th>
                                             <th class="class40">Description</th>
                                             <th class="class20">SoundChannel</th>
-                                            <th class="class05">ID</th>
-                                            <th class="class30">BP</th>
+                                            <th class="class05">Address</th>
+                                            <th class="class30">Contact Output</th>
                                         </tr>
                                     </thead>
                                     <tbody id="broadcastzonetablebody"></tbody>
diff --git a/html/webpage/messagebank.html b/html/webpage/messagebank.html
index 65e458e..7018683 100644
--- a/html/webpage/messagebank.html
+++ b/html/webpage/messagebank.html
@@ -111,7 +111,7 @@
                             </select></div>
                     </div>
                     <div class="row">
-                        <div class="col bg-light"><select class="w-100 h-100" id="messageavailablevariables" size="10"></select></div>
+                        <div class="col bg-light"><select class="w-100 h-100 overflow-scroll" id="messageavailablevariables" size="10"></select></div>
                         <div class="col-3 col-sm-3 col-md-3 col-lg-2 col-xl-2">
                             <div class="row pad-row-btn"><button class="btn btn-round-basic color-remove" data-bs-toggle="tooltip" data-bss-tooltip="" id="btnclearlist" type="button" title="Clear List"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="1em" height="1em" fill="currentColor" style="font-size: 32;">
                                         <!--! Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2023 Fonticons, Inc. -->
@@ -126,7 +126,7 @@
                                         <path d="M464 256A208 208 0 1 1 48 256a208 208 0 1 1 416 0zM0 256a256 256 0 1 0 512 0A256 256 0 1 0 0 256zM294.6 135.1c-4.2-4.5-10.1-7.1-16.3-7.1C266 128 256 138 256 150.3V208H160c-17.7 0-32 14.3-32 32v32c0 17.7 14.3 32 32 32h96v57.7c0 12.3 10 22.3 22.3 22.3c6.2 0 12.1-2.6 16.3-7.1l99.9-107.1c3.5-3.8 5.5-8.7 5.5-13.8s-2-10.1-5.5-13.8L294.6 135.1z"></path>
                                     </svg></button></div>
                         </div>
-                        <div class="col bg-light"><select class="w-100 h-100" id="messageselectedvariables" size="10"></select></div>
+                        <div class="col bg-light"><select class="w-100 h-100 overflow-scroll" id="messageselectedvariables" size="10"></select></div>
                     </div>
                 </div>
                 <div class="modal-footer"><button class="btn btn-round-basic color-edit class25" id="closemodalbutton" type="button" data-bs-dismiss="modal">Close</button><button class="btn btn-round-basic color-add class25" id="savemodalbutton" type="button">Save</button></div>