Index: /branches/amp_3_7/extensions/monitoring/webui/monitoring.service.js
===================================================================
--- /branches/amp_3_7/extensions/monitoring/webui/monitoring.service.js	(revision 2638)
+++ /branches/amp_3_7/extensions/monitoring/webui/monitoring.service.js	(working copy)
@@ -125,29 +125,50 @@
                 return deferred.promise;
             }
             function getLLBLinks(device_ip) {
-                let deferred = $q.defer();
-                let payload = {
-                    "action": "get_threshold_stats",
-                    "query": {
-                        "serviceType": "LLB",
-                        "device_ip": device_ip
-                    }
-                }
-                dashboardService.composer_query(payload).then(function (res) {
-                    var serverList = []
-                    if (res && res.status === 200) {
-                        _.each(res.data.results[0].series, function (series) {
-                            serverList.push({
-                                "name": series.tags.linkName,
-                                "origin_type": "LLB",
-                                "device_ip": device_ip
-                            })
-                        })
-                    }
-                    deferred.resolve(serverList);
-                });
-                return deferred.promise;
-            }
+              let deferred = $q.defer();
+              let payload = {
+                  "action": "get_threshold_stats",
+                  "query": {
+                      "serviceType": "LLB",
+                      "device_ip": device_ip
+                  }
+              }
+              dashboardService.composer_query(payload).then(function (res) {
+                  let serverList = [];
+                  if (res && res.status === 200 && res.data && res.data.results && res.data.results.length > 0) {
+                      const firstResult = res.data.results[0];
+                      if (firstResult.series && firstResult.series.length > 0) {
+                          let allLinkNames = [];
+                          _.each(firstResult.series, function (series) {
+                              const linkNameColumnIndex = series.columns.indexOf("linkName");
+                              if (linkNameColumnIndex !== -1) {
+                                  _.each(series.values, function (row) {
+                                      const linkName = row[linkNameColumnIndex];
+                                      if (linkName) {
+                                          allLinkNames.push(linkName);
+                                      }
+                                  });
+                              } else {
+                                  console.warn("linkName column not found in series (check capitalization/existence):", series.columns);
+                              }
+                          });
+
+                          const uniqueLinkNames = _.uniq(allLinkNames);
+                          _.each(uniqueLinkNames, function(name) {
+                              serverList.push({
+                                  "name": name,
+                                  "origin_type": "LLB",
+                                  "device_ip": device_ip
+                              });
+                          });
+                      }
+                  }
+                  deferred.resolve(serverList);
+              }).catch(function(error) {
+                  console.error("Error in getLLBLinks:", error);
+                  deferred.reject(error);
+              });
+              return deferred.promise;
+          }
         }
     ]);
-
Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/hive/services/composer_query_service.py
===================================================================
--- /branches/amp_3_7/src/webui/webui/htdocs/new/src/hive/services/composer_query_service.py	(revision 2638)
+++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/hive/services/composer_query_service.py	(working copy)
@@ -210,6 +210,11 @@
                 if 'device_ip' in request['query']:
                     query_string += " and agent_host='{}'".format(request['query']['device_ip'])
                 query_string += ' group by Id, agent_host;'
+            elif request['query']['serviceType'] == 'LLB':
+                query_string = 'select * from llbStats where time > now()-20s'
+                if 'device_ip' in request['query']:
+                    query_string += " and agent_host='{}'".format(request['query']['device_ip'])
+                query_string += ' group by Id, agent_host;'
         else:
             oper_log('error', 'system', "Required fields (serviceType) are missing.")
             raise ge.ANInternalException(parm_name="query_payload", error_code=400,