diff --git a/app/common/services/api-utils.js b/app/common/services/api-utils.js
index 67a0641..46caf90 100644
--- a/app/common/services/api-utils.js
+++ b/app/common/services/api-utils.js
@@ -429,6 +429,7 @@
                       var title = "";
                       var tempKeyParts = [];
                       var order = 0;
+                      var customOrder = 0;
 
                       function getScaledValue(value, scale){
                         scale = scale + "";
@@ -503,6 +504,12 @@
 
                           content.data[key].Value = getScaledValue(content.data[key].Value, content.data[key].Scale);
 
+                          if(Constants.SENSOR_SORT_ORDER.indexOf(content.data[key].Unit) > -1){
+                            customOrder = Constants.SENSOR_SORT_ORDER.indexOf(content.data[key].Unit);
+                          }else{
+                            customOrder = Constants.SENSOR_SORT_ORDER_DEFAULT;
+                          }
+
                           sensorData.push(Object.assign({
                             path: key,
                             selected: false,
@@ -513,6 +520,7 @@
                             severity_flags: severity.flags,
                             status: severity.severityText,
                             order: severity.order,
+                            custom_order: customOrder,
                             search_text: (title + " " + content.data[key].Value + " " + 
                                Constants.SENSOR_UNIT_MAP[content.data[key].Unit] + " " + 
                                severity.severityText + " " +