diff --git a/html/webpage/assets/js/usermanagement.js b/html/webpage/assets/js/usermanagement.js
index a163a60..19173a9 100644
--- a/html/webpage/assets/js/usermanagement.js
+++ b/html/webpage/assets/js/usermanagement.js
@@ -172,41 +172,20 @@ $(document).ready(function () {
 
     let APIURL = "UserManagement/";
 
-    // add / edit modal elements
-    let $addmodal = $('#addmodal');
-    let $modalindex = $('#modalindex');
-    let $modalusername = $('#modalusername');
-    let $modalpassword = $('#modalpassword');
-    let $modalverifypassword = $('#modalverifypassword');
-    let $modallocation = $('#modallocation');
-    let $modalairlinetags = $('#modalairlinetags');
-    let $modalcitytags = $('#modalcitytags');
-    let $modalmessagebank = $('#modalmessagebank');
-    let $modalbroadcastzones = $('#modalbroadcastzones');
-    let $btnShowSoundbankModal = $('#btnShowSoundbankModal');
-    let $btnShowMessagebankModal = $('#btnShowMessagebankModal');
-    let $btnShowBroaadcastZoneModal = $('#btnShowBroaadcastZoneModal');
-
-
     function clearAddModal() {
-        $modalindex.val("");
-        $modalusername.val("");
-        $modalpassword.val("");
-        $modalverifypassword.val("");
-        $modalairlinetags.val("");
-        $modalcitytags.val("");
-        $modalmessagebank.val("");
-        $modalbroadcastzones.val("");
-        $modallocation.val("");
+        $('#modalindex').val("");
+        $('#modalusername').val("");
+        $('#modalpassword').val("");
+        $('#modalverifypassword').val("");
+        $('#modalairlinetags').val("");
+        $('#modalcitytags').val("");
+        $('#modalmessagebank').val("");
+        $('#modalbroadcastzones').val("");
+        $('#modallocation').val("");
     }
 
-    // soundbank selection modal elements
-    let $soundbankmodal = $('#soundbankmodal');
-    let $citylist = $('#citylist');
-    let $airlinelist = $('#airlinelist');
-
     function fill_citylist() {
-        $citylist.empty();
+        $('#citylist').empty();
         citytags.forEach(tag => {
             let value = `${tag.value} [${tag.key}]`;
             const row = `<div class="form-check">
@@ -215,12 +194,12 @@ $(document).ready(function () {
                            ${value}
                          </label>
                        </div>`;
-            $citylist.append(row);
+            $('#citylist').append(row);
         });
     }
 
     function fill_airlinelist() {
-        $airlinelist.empty();
+        $('#airlinelist').empty();
         airlinetags.forEach(tag => {
             let value = `${tag.value} [${tag.key}]`;
             const row = `<div class="form-check">
@@ -229,16 +208,14 @@ $(document).ready(function () {
                            ${value}
                          </label>
                        </div>`;
-            $airlinelist.append(row);
+            $('#airlinelist').append(row);
         });
     }
 
     // broadcast zone selection modal elements
-    let $broadcastzonemodal = $('#broadcastzonemodal');
-    let $broadcastzonelist = $('#broadcastzonelist');
 
     function fill_broadcastzonelist() {
-        $broadcastzonelist.empty();
+        $('#broadcastzonelist').empty();
         broadcastzones.forEach(desc => {
             const row = `<div class="form-check">
                          <input class="form-check-input broadcastzonecheckbox" type="checkbox" value="${desc}" id="broadcastzone_${desc}">
@@ -246,17 +223,15 @@ $(document).ready(function () {
                            ${desc}
                          </label>
                        </div>`;
-            $broadcastzonelist.append(row);
+            $('#broadcastzonelist').append(row);
         });
     }
 
 
     // messagebank selection modal elements
-    let $messagebankmodal = $('#messagebankmodal');
-    let $messagebanklist = $('#messagebanklist');
 
     function fill_messagebanklist() {
-        $messagebanklist.empty();
+        $('#messagebanklist').empty();
         messagebankids.forEach(id => {
             let value = `${id.value} [${id.key}]`;
             const row = `<div class="form-check">
@@ -265,7 +240,7 @@ $(document).ready(function () {
                            ${value}
                          </label>
                        </div>`;
-            $messagebanklist.append(row);
+            $('#messagebanklist').append(row);
         });
     }
 
@@ -296,13 +271,13 @@ $(document).ready(function () {
      */
     function modalshow(editmode = false, index=0) {
         // event on click btnShowSoundbankModal
-        $btnShowSoundbankModal.off('click').on('click', function () {
-            $soundbankmodal.modal('show');
+        $('#btnShowSoundbankModal').off('click').on('click', function () {
+            $('#soundbankmodal').modal('show');
             fill_citylist();
             fill_airlinelist();
 
-            let airline = $modalairlinetags.val().trim();
-            let city = $modalcitytags.val().trim();
+            let airline = $('#modalairlinetags').val().trim();
+            let city = $('#modalcitytags').val().trim();
             if (airline.length > 0) {
                 let airlinekeys = airline.split(";");
                 $('#airlinelist input[type=checkbox]').each(function () {
@@ -322,7 +297,7 @@ $(document).ready(function () {
                 });
             }
 
-            $soundbankmodal.off('click.soundbankselectionsave').on('click.soundbankselectionsave', '#soundbankselectionsave', function () {
+            $('#soundbankmodal').off('click.soundbankselectionsave').on('click.soundbankselectionsave', '#soundbankselectionsave', function () {
                 let selected_airlinetags = [];
                 $('#airlinelist input[type=checkbox]:checked').each(function () {
                     selected_airlinetags.push($(this).val());
@@ -342,21 +317,21 @@ $(document).ready(function () {
 
                 let airlinevalue = selected_airlinetags.join(";");
                 let cityvalue = selected_citytags.join(";");
-                $modalairlinetags.val(airlinevalue);
-                $modalcitytags.val(cityvalue);
+                $('#modalairlinetags').val(airlinevalue);
+                $('#modalcitytags').val(cityvalue);
 
 
-                $soundbankmodal.modal('hide');
+                $('#soundbankmodal').modal('hide');
             });
-            $soundbankmodal.off('click.soundbankselectionclose').on('click.soundbankselectionclose', '#soundbankselectionclose', function () {
-                $soundbankmodal.modal('hide');
+            $('#soundbankmodal').off('click.soundbankselectionclose').on('click.soundbankselectionclose', '#soundbankselectionclose', function () {
+                $('#soundbankmodal').modal('hide');
             });
         });
         // event on click btnShowMessagebankModal
-        $btnShowMessagebankModal.off('click').on('click', function () {
-            $messagebankmodal.modal('show');
+        $('#btnShowMessagebankModal').off('click').on('click', function () {
+            $('#messagebankmodal').modal('show');
             fill_messagebanklist();
-            let messagebank = $modalmessagebank.val().trim();
+            let messagebank = $('#modalmessagebank').val().trim();
             if (messagebank.length > 0) {
                 let messagebankkeys = messagebank.split(";");
                 $('#messagebanklist input[type=checkbox]').each(function () {
@@ -367,7 +342,7 @@ $(document).ready(function () {
                 });
             }
 
-            $messagebankmodal.off('click.messagebankselectionsave').on('click.messagebankselectionsave', '#messagebankselectionsave', function () {
+            $('#messagebankmodal').off('click.messagebankselectionsave').on('click.messagebankselectionsave', '#messagebankselectionsave', function () {
                 let selected_messagebankids = [];
                 $('#messagebanklist input[type=checkbox]:checked').each(function () {
                     selected_messagebankids.push($(this).val());
@@ -378,19 +353,19 @@ $(document).ready(function () {
                     return;
                 }
                 let messagebankvalue = selected_messagebankids.join(";");
-                $modalmessagebank.val(messagebankvalue);
+                $('#modalmessagebank').val(messagebankvalue);
 
-                $messagebankmodal.modal('hide');
+                $('#messagebankmodal').modal('hide');
             });
-            $messagebankmodal.off('click.messagebankselectionclose').on('click.messagebankselectionclose', '#messagebankselectionclose', function () {
-                $messagebankmodal.modal('hide');
+            $('#messagebankmodal').off('click.messagebankselectionclose').on('click.messagebankselectionclose', '#messagebankselectionclose', function () {
+                $('#messagebankmodal').modal('hide');
             });
         });
         // event on click btnShowBroaadcastZoneModal
-        $btnShowBroaadcastZoneModal.off('click').on('click', function () {
-            $broadcastzonemodal.modal('show');
+        $('#btnShowBroaadcastZoneModal').off('click').on('click', function () {
+            $('#broadcastzonemodal').modal('show');
             fill_broadcastzonelist();
-            let broadcastzones = $modalbroadcastzones.val().trim();
+            let broadcastzones = $('#modalbroadcastzones').val().trim();
             if (broadcastzones.length > 0) {
                 let broadcastzonesvalues = broadcastzones.split(";");
                 $('#broadcastzonelist input[type=checkbox]').each(function () {
@@ -400,7 +375,7 @@ $(document).ready(function () {
                     }
                 });
             }
-            $broadcastzonemodal.off('click.broadcastzoneselectionsave').on('click.broadcastzoneselectionsave', '#broadcastzoneselectionsave', function () {
+            $('#broadcastzonemodal').off('click.broadcastzoneselectionsave').on('click.broadcastzoneselectionsave', '#broadcastzoneselectionsave', function () {
                 let selected_broadcastzones = [];
                 $('#broadcastzonelist input[type=checkbox]:checked').each(function () {
                     selected_broadcastzones.push($(this).val());
@@ -411,24 +386,24 @@ $(document).ready(function () {
                     return;
                 }
                 let broadcastzonesvalue = selected_broadcastzones.join(";");
-                $modalbroadcastzones.val(broadcastzonesvalue);
-                $broadcastzonemodal.modal('hide');
+                $('#modalbroadcastzones').val(broadcastzonesvalue);
+                $('#broadcastzonemodal').modal('hide');
             });
-            $broadcastzonemodal.off('click.broadcastzoneselectionclose').on('click.broadcastzoneselectionclose', '#broadcastzoneselectionclose', function () {
-                $broadcastzonemodal.modal('hide');
+            $('#broadcastzonemodal').off('click.broadcastzoneselectionclose').on('click.broadcastzoneselectionclose', '#broadcastzoneselectionclose', function () {
+                $('#broadcastzonemodal').modal('hide');
             });
         });
 
         // event on Click save button
-        $addmodal.off('click.usermanagementsave').on('click.usermanagementsave', '#usermanagementsave', function () {
-            let username = $modalusername.val().trim();
-            let password = $modalpassword.val();
-            let verifypassword = $modalverifypassword.val();
-            let location = $modallocation.val().trim();
-            let airline_tags = $modalairlinetags.val().trim();
-            let city_tags = $modalcitytags.val().trim();
-            let messagebank_ann_id = $modalmessagebank.val().trim();
-            let broadcastzones = $modalbroadcastzones.val().trim();
+        $('#addmodal').off('click.usermanagementsave').on('click.usermanagementsave', '#usermanagementsave', function () {
+            let username = $('#modalusername').val().trim();
+            let password = $('#modalpassword').val();
+            let verifypassword = $('#modalverifypassword').val();
+            let location = $('#modallocation').val().trim();
+            let airline_tags = $('#modalairlinetags').val().trim();
+            let city_tags = $('#modalcitytags').val().trim();
+            let messagebank_ann_id = $('#modalmessagebank').val().trim();
+            let broadcastzones = $('#modalbroadcastzones').val().trim();
 
             if (username.length === 0) {
                 alert("Username cannot be empty");
@@ -491,11 +466,11 @@ $(document).ready(function () {
             }
 
 
-            $addmodal.modal('hide');
+            $('#addmodal').modal('hide');
         });
         // event on Click close button
-        $addmodal.off('click.usermanagementclose').on('click.usermanagementclose', '#usermanagementclose', function () {
-            $addmodal.modal('hide');
+        $('#addmodal').off('click.usermanagementclose').on('click.usermanagementclose', '#usermanagementclose', function () {
+            $('#addmodal').modal('hide');
         });
     }
 
@@ -508,7 +483,7 @@ $(document).ready(function () {
         });
     });
     $('#btnAdd').off('click').on('click', () => {
-        $addmodal.modal('show');
+        $('#addmodal').modal('show');
         clearAddModal();
         modalshow(false,0);
     });
@@ -552,17 +527,17 @@ $(document).ready(function () {
                 return;
             }
             if (confirm(`Are you sure to edit user [${user.index}] Username=${user.username} ?`)) {
-                $addmodal.modal('show');
+                $('#addmodal').modal('show');
                 // fill modal with user data
-                $modalindex.val(user.index);
-                $modalusername.val(user.username);
-                $modalpassword.val(user.password);
-                $modalverifypassword.val(user.password);
-                $modallocation.val(user.location);
-                $modalairlinetags.val(user.airline_tags);
-                $modalcitytags.val(user.city_tags);
-                $modalmessagebank.val(user.messagebank_ann_id);
-                $modalbroadcastzones.val(user.broadcastzones);
+                $('#modalindex').val(user.index);
+                $('#modalusername').val(user.username);
+                $('#modalpassword').val(user.password);
+                $('#modalverifypassword').val(user.password);
+                $('#modallocation').val(user.location);
+                $('#modalairlinetags').val(user.airline_tags);
+                $('#modalcitytags').val(user.city_tags);
+                $('#modalmessagebank').val(user.messagebank_ann_id);
+                $('#modalbroadcastzones').val(user.broadcastzones);
                 modalshow(true, user.index);
 
             }