diff --git a/modules/monitoring/library/Monitoring/DataView/Comment.php b/modules/monitoring/library/Monitoring/DataView/Comment.php
index 08928b5dd..4cd11e1a1 100644
--- a/modules/monitoring/library/Monitoring/DataView/Comment.php
+++ b/modules/monitoring/library/Monitoring/DataView/Comment.php
@@ -45,13 +45,20 @@ class Comment extends DataView
             'comment_timestamp' => array(
                 'order' => self::SORT_DESC
             ),
-            'comment_host' => array(
+            'host_display_name' => array(
                 'columns' => array(
-                    'comment_host',
-                    'comment_service'
+                    'host_display_name',
+                    'service_display_name'
                 ),
                 'order' => self::SORT_ASC
             ),
+            'service_display_name' => array(
+                'columns' => array(
+                    'service_display_name',
+                    'host_display_name'
+                ),
+                'order' => self::SORT_ASC
+            )
         );
     }
 }