diff --git a/Frontend/_sysMonAll.html b/Frontend/_sysMonAll.html
index 6ede9d8..8e9b9ca 100644
--- a/Frontend/_sysMonAll.html
+++ b/Frontend/_sysMonAll.html
@@ -57,7 +57,7 @@
     function getFloDevList() {
         let url = baseApiUrl + "/api/Device/GetDeviceList";
         let sendData = {
-            main_system_tag: pageAct.sysMainTag,
+            sub_system_tag: pageAct.sysSubTag,
             building_tag: pageAct.buiTag,
             floor_tag: pageAct.floTag,
         };
diff --git a/Frontend/_systemMonitor.html b/Frontend/_systemMonitor.html
index 402b514..da3be8e 100644
--- a/Frontend/_systemMonitor.html
+++ b/Frontend/_systemMonitor.html
@@ -5,7 +5,7 @@
 </style>
 <div class="container-fluid">
     <div class="row bg-dark">
-        <h1 id="sysMainText" class="p-2 mx-5 mb-0"></h1>
+        <h1 id="sysSubText" class="p-2 mx-5 mb-0"></h1>
         <div class="btn-group my-2" id="floList">
             
         </div>
@@ -20,7 +20,7 @@
     var floList = [];
     
     $(function () {
-        $("#sysMainText").text(pageAct.sysMainName);
+        $("#sysSubText").text(pageAct.sysSubName);
         getFloList();
     })
 
diff --git a/Frontend/index.html b/Frontend/index.html
index 40bf6c9..18e0b19 100644
--- a/Frontend/index.html
+++ b/Frontend/index.html
@@ -2096,7 +2096,8 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
 
         onEvent("active:change", "#sysMonBtnList", function (e, actEle) {
             if (actEle) {
-                pageAct.sysMainTag = $(actEle).prop("id").split("mainSysBtn")[1];
+                pageAct.sysMainTag = $(actEle).data("maintag");
+                pageAct.sysSubTag = $(actEle).prop("id").split("subSysBtn")[1];
                 pageAct.sysMainName = $(actEle).text();
             }
             $(this).trigger("change");
@@ -2120,8 +2121,8 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
 
                 } else {
                     let strHtml = ``;
-                    $.each(res.data.history_Main_Systems, (index, mainSysObj) => {
-                        strHtml += `<button id="mainSysBtn${mainSysObj.main_system_tag}" class="dropdown-item" type="button" data-page="systemMonitor" name="topFunBtn">${mainSysObj.full_name}</button>`;
+                    $.each(res.data.history_Main_Systems, (index, subSysObj) => {
+                        strHtml += `<button id="subSysBtn${subSysObj.sub_system_tag}" data-maintag="${subSysObj.main_system_tag}"class="dropdown-item" type="button" data-page="systemMonitor" name="topFunBtn">${subSysObj.full_name}</button>`;
                     })
                     $("#sysMonBtnList").append(strHtml);
                 }