diff --git a/modules/monitoring/library/Monitoring/DataView/Hostcomment.php b/modules/monitoring/library/Monitoring/DataView/Hostcomment.php
index b751a82b9..d1afbdd74 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hostcomment.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hostcomment.php
@@ -8,19 +8,6 @@ namespace Icinga\Module\Monitoring\DataView;
  */
 class Hostcomment extends DataView
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function isValidFilterTarget($column)
-    {
-        if ($column[0] === '_'
-            && preg_match('/^_(?:host|service)_/', $column)
-        ) {
-            return true;
-        }
-        return parent::isValidFilterTarget($column);
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -47,8 +34,23 @@ class Hostcomment extends DataView
     public function getFilterColumns()
     {
         return array(
-            'host', 'hostgroup', 'hostgroup_alias', 'hostgroup_name',
-            'service', 'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+            'host', 'host_alias',
+            'hostgroup', 'hostgroup_alias', 'hostgroup_name',
+            'service', 'service_description', 'service_display_name',
+            'servicegroup', 'servicegroup_alias', 'servicegroup_name'
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isValidFilterTarget($column)
+    {
+        if ($column[0] === '_'
+            && preg_match('/^_(?:host|service)_/', $column)
+        ) {
+            return true;
+        }
+        return parent::isValidFilterTarget($column);
+    }
 }
diff --git a/modules/monitoring/library/Monitoring/DataView/Hostdowntime.php b/modules/monitoring/library/Monitoring/DataView/Hostdowntime.php
index f95f82da2..3b1c901b5 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hostdowntime.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hostdowntime.php
@@ -8,19 +8,6 @@ namespace Icinga\Module\Monitoring\DataView;
  */
 class Hostdowntime extends DataView
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function isValidFilterTarget($column)
-    {
-        if ($column[0] === '_'
-            && preg_match('/^_(?:host|service)_/', $column)
-        ) {
-            return true;
-        }
-        return parent::isValidFilterTarget($column);
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -52,8 +39,23 @@ class Hostdowntime extends DataView
     public function getFilterColumns()
     {
         return array(
-            'host', 'hostgroup', 'hostgroup_alias', 'hostgroup_name',
-            'service', 'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+            'host', 'host_alias',
+            'hostgroup', 'hostgroup_alias', 'hostgroup_name',
+            'service', 'service_description', 'service_display_name',
+            'servicegroup', 'servicegroup_alias', 'servicegroup_name'
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isValidFilterTarget($column)
+    {
+        if ($column[0] === '_'
+            && preg_match('/^_(?:host|service)_/', $column)
+        ) {
+            return true;
+        }
+        return parent::isValidFilterTarget($column);
+    }
 }
diff --git a/modules/monitoring/library/Monitoring/DataView/Servicecomment.php b/modules/monitoring/library/Monitoring/DataView/Servicecomment.php
index 64d193cfa..b3d11ad49 100644
--- a/modules/monitoring/library/Monitoring/DataView/Servicecomment.php
+++ b/modules/monitoring/library/Monitoring/DataView/Servicecomment.php
@@ -8,19 +8,6 @@ namespace Icinga\Module\Monitoring\DataView;
  */
 class Servicecomment extends DataView
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function isValidFilterTarget($column)
-    {
-        if ($column[0] === '_'
-            && preg_match('/^_(?:host|service)_/', $column)
-        ) {
-            return true;
-        }
-        return parent::isValidFilterTarget($column);
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -50,8 +37,23 @@ class Servicecomment extends DataView
     public function getFilterColumns()
     {
         return array(
-            'host', 'hostgroup', 'hostgroup_alias', 'hostgroup_name',
-            'service', 'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+            'host', 'host_alias',
+            'hostgroup', 'hostgroup_alias', 'hostgroup_name',
+            'service',
+            'servicegroup', 'servicegroup_alias', 'servicegroup_name'
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isValidFilterTarget($column)
+    {
+        if ($column[0] === '_'
+            && preg_match('/^_(?:host|service)_/', $column)
+        ) {
+            return true;
+        }
+        return parent::isValidFilterTarget($column);
+    }
 }
diff --git a/modules/monitoring/library/Monitoring/DataView/Servicedowntime.php b/modules/monitoring/library/Monitoring/DataView/Servicedowntime.php
index 1969aec44..0f14857d4 100644
--- a/modules/monitoring/library/Monitoring/DataView/Servicedowntime.php
+++ b/modules/monitoring/library/Monitoring/DataView/Servicedowntime.php
@@ -5,19 +5,6 @@ namespace Icinga\Module\Monitoring\DataView;
 
 class Servicedowntime extends DataView
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function isValidFilterTarget($column)
-    {
-        if ($column[0] === '_'
-            && preg_match('/^_(?:host|service)_/', $column)
-        ) {
-            return true;
-        }
-        return parent::isValidFilterTarget($column);
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -52,8 +39,23 @@ class Servicedowntime extends DataView
     public function getFilterColumns()
     {
         return array(
-            'host', 'hostgroup', 'hostgroup_alias', 'hostgroup_name',
-            'service', 'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+            'host', 'host_alias',
+            'hostgroup', 'hostgroup_alias', 'hostgroup_name',
+            'service',
+            'servicegroup', 'servicegroup_alias', 'servicegroup_name'
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isValidFilterTarget($column)
+    {
+        if ($column[0] === '_'
+            && preg_match('/^_(?:host|service)_/', $column)
+        ) {
+            return true;
+        }
+        return parent::isValidFilterTarget($column);
+    }
 }