diff --git a/app/common/services/api-utils.js b/app/common/services/api-utils.js
index 5eadb33..3e0c59e 100644
--- a/app/common/services/api-utils.js
+++ b/app/common/services/api-utils.js
@@ -499,26 +499,26 @@
                       function getSensorStatus(reading){
                         var severityFlags = {critical: false, warning: false, normal: false}, severityText = '', order = 0;
 
-                        if(reading.hasOwnProperty('CriticalLow') && 
+                        if(reading.hasOwnProperty('CriticalLow') &&
                           reading.Value < reading.CriticalLow
                           ){
                           severityFlags.critical = true;
                           severityText = 'critical';
                           order = 2;
-                        }else if(reading.hasOwnProperty('CriticalHigh') && 
-                          reading.Value > reading.CriticalHigh 
+                        }else if(reading.hasOwnProperty('CriticalHigh') &&
+                          reading.Value > reading.CriticalHigh
                           ){
                           severityFlags.critical = true;
                           severityText = 'critical';
                           order = 2;
-                        }else if(reading.hasOwnProperty('CriticalLow') && 
-                          reading.hasOwnProperty('WarningLow') && 
+                        }else if(reading.hasOwnProperty('CriticalLow') &&
+                          reading.hasOwnProperty('WarningLow') &&
                           reading.Value >= reading.CriticalLow && reading.Value <= reading.WarningLow){
                           severityFlags.warning = true;
                           severityText = 'warning';
                           order = 1;
-                        }else if(reading.hasOwnProperty('WarningHigh') && 
-                          reading.hasOwnProperty('CriticalHigh') && 
+                        }else if(reading.hasOwnProperty('WarningHigh') &&
+                          reading.hasOwnProperty('CriticalHigh') &&
                           reading.Value >= reading.WarningHigh && reading.Value <= reading.CriticalHigh){
                           severityFlags.warning = true;
                           severityText = 'warning';
@@ -576,9 +576,9 @@
                             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 + " " + 
+                            search_text: (title + " " + content.data[key].Value + " " +
+                               Constants.SENSOR_UNIT_MAP[content.data[key].Unit] + " " +
+                               severity.severityText + " " +
                                content.data[key].CriticalLow + " " +
                                content.data[key].CriticalHigh + " " +
                                content.data[key].WarningLow + " " +
@@ -688,8 +688,8 @@
                       }
 
                       deferred.resolve({
-                          data: data, 
-                          bmcActiveVersion: bmcActiveVersion, 
+                          data: data,
+                          bmcActiveVersion: bmcActiveVersion,
                           hostActiveVersion: hostActiveVersion
                       });
                 }, function(error){
@@ -916,11 +916,11 @@
                           searchText += " " + data[i].key + " " + data[i].value;
                         }
 
-                        return searchText; 
+                        return searchText;
                       }
 
                       for(var key in content.data){
-                        if(content.data.hasOwnProperty(key) && 
+                        if(content.data.hasOwnProperty(key) &&
                            key.indexOf(Constants.HARDWARE.component_key_filter) == 0){
 
                           data = camelcaseToLabel(content.data[key]);
@@ -936,7 +936,7 @@
                                 selected: false,
                                 expanded: false,
                                 search_text: title.toLowerCase() + " " + searchText.toLowerCase(),
-                                sub_components: [], 
+                                sub_components: [],
                                 original_data: {key: key, value: content.data[key]}
                               }, {items: data}));
 
