diff --git a/html/pages/device/overview/generic/sensor.inc.php b/html/pages/device/overview/generic/sensor.inc.php
index 45619baab4..a0cd971873 100644
--- a/html/pages/device/overview/generic/sensor.inc.php
+++ b/html/pages/device/overview/generic/sensor.inc.php
@@ -78,16 +78,16 @@ if (count($sensors)) {
                     break;
             }
             echo '<tr>
-                <td>'.overlib_link($link, shorten_interface_type($sensor['sensor_descr']), $overlib_content).'</td>
-                <td>'.overlib_link($link, $sensor_minigraph, $overlib_content).'</td>
-                <td>'.overlib_link($link, '<span '.$state_style.'>'.$state_translation['0']['state_descr'].'</span>', $overlib_content).'</td>
+                <td>'.overlib_link($link, shorten_interface_type($sensor['sensor_descr']), $overlib_content, $sensor_class).'</td>
+                <td>'.overlib_link($link, $sensor_minigraph, $overlib_content, $sensor_class).'</td>
+                <td>'.overlib_link($link, '<span '.$state_style.'>'.$state_translation['0']['state_descr'].'</span>', $overlib_content, $sensor_class).'</td>
                 </tr>';
         }
         else {
             echo '<tr>
-                <td>'.overlib_link($link, shorten_interface_type($sensor['sensor_descr']), $overlib_content).'</td>
-                <td>'.overlib_link($link, $sensor_minigraph, $overlib_content).'</td>
-                <td>'.overlib_link($link, '<span '.($sensor['sensor_current'] < $sensor['sensor_limit_low'] || $sensor['sensor_current'] > $sensor['sensor_limit'] ? "style='color: red'" : '').'>'.$sensor['sensor_current'].$sensor_unit.'</span>', $overlib_content).'</td>
+                <td>'.overlib_link($link, shorten_interface_type($sensor['sensor_descr']), $overlib_content, $sensor_class).'</td>
+                <td>'.overlib_link($link, $sensor_minigraph, $overlib_content, $sensor_class).'</td>
+                <td>'.overlib_link($link, '<span '.($sensor['sensor_current'] < $sensor['sensor_limit_low'] || $sensor['sensor_current'] > $sensor['sensor_limit'] ? "style='color: red'" : '').'>'.$sensor['sensor_current'].$sensor_unit.'</span>', $overlib_content, $sensor_class).'</td>
                 </tr>';
         }
     }//end foreach
diff --git a/includes/discovery/sensors/states/cisco.inc.php b/includes/discovery/sensors/states/cisco.inc.php
index 1fb11c2516..a3478c63d5 100644
--- a/includes/discovery/sensors/states/cisco.inc.php
+++ b/includes/discovery/sensors/states/cisco.inc.php
@@ -24,13 +24,12 @@ if ($device['os_group'] == 'cisco') {
         $cur_oid = $tablevalue[1];
 
         if (is_array($temp)) {
-
             //Create State Index
             $state_name = $tablevalue[2];
             $state_index_id = create_state_index($state_name);
 
             //Create State Translation
-            if ($state_index_id) {
+            if ($state_index_id !== null) {
                 $states = array(
                      array($state_index_id,'normal',0,1,0) ,
                      array($state_index_id,'warning',0,2,1) ,