diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 8a5cd1489..4b469a234 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -22,7 +22,7 @@ class Monitoring_ListController extends ModuleActionController
     public function hostsAction()
     {
         Benchmark::measure("hostsAction::query()");
-        $this->view->hosts = $this->backend->select()->from(
+        $this->view->hosts = $this->query(
             'status',
             array(
                 'host_icon_image',
@@ -45,28 +45,6 @@ class Monitoring_ListController extends ModuleActionController
                 'host_last_comment'
             )
         );
-          
-        if ($search = $this->_getParam('search')) {
-            $this->_setParam('search', null);
-            if (strpos($search, '=') === false) {
-                $this->_setParam('host_name', $search);
-            } else {
-                list($key, $val) = preg_split('~\s*=\s*~', $search, 2);
-                if ($this->view->hosts->isValidFilterColumn($key) || $key[0] === '_') {
-                    $this->_setParam($key, $val);
-                }
-            }
-        }
-
-        //$this->view->hosts->getQuery()->group('host_id');
-        if ($this->_getParam('dump') === 'sql') {
-            echo '<pre>' . htmlspecialchars(wordwrap($this->view->hosts->getQuery()->dump())) . '</pre>';
-            exit;
-        }
-
-        if ($this->_getParam('view') === 'compact') {
-            $this->_helper->viewRenderer('hosts_compact');
-        }
 
     }
 
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index acac94638..51f06990e 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -47,7 +47,7 @@ $trimArea = $this->getHelper('Trim');
             </td>
             <td class="icons indicator"> 
                 <div class="icon-box"><?php $trimArea->start(); ?>
-                <?php if (!$host->host_handled): ?>
+                <?php if (!$host->host_handled && $host->host_state > 0): ?>
                     <a href="#" title="<?= 'Unhandled host' ?>">
                         <i class="icon-warning-sign"></i>
                     </a>