diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StateHistorySummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StateHistorySummaryQuery.php
index cdaee0697..9004d5250 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StateHistorySummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StateHistorySummaryQuery.php
@@ -10,6 +10,7 @@ class StateHistorySummaryQuery extends IdoQuery
         'statehistory' => array(
             'day'                  => 'DATE(sh.state_time)',
             'cnt_events'           => 'COUNT(*)',
+            'objecttype_id'        => 'sho.objecttype_id',
             'cnt_up'               => 'SUM(CASE WHEN sho.objecttype_id = 1 AND sh.state = 0 THEN 1 ELSE 0 END)',
             'cnt_down_hard'        => 'SUM(CASE WHEN sho.objecttype_id = 1 AND sh.state = 1 AND state_type = 1 THEN 1 ELSE 0 END)',
             'cnt_down'             => 'SUM(CASE WHEN sho.objecttype_id = 1 AND sh.state = 1 THEN 1 ELSE 0 END)',
@@ -23,6 +24,19 @@ class StateHistorySummaryQuery extends IdoQuery
             'cnt_warning'          => 'SUM(CASE WHEN sho.objecttype_id = 2 AND sh.state = 1 THEN 1 ELSE 0 END)',
             'cnt_warning_hard'     => 'SUM(CASE WHEN sho.objecttype_id = 2 AND sh.state = 1 AND state_type = 1 THEN 1 ELSE 0 END)',
             'cnt_ok'               => 'SUM(CASE WHEN sho.objecttype_id = 2 AND sh.state = 0 THEN 1 ELSE 0 END)',
+            'host'                => 'sho.name1 COLLATE latin1_general_ci',
+            'service'             => 'sho.name2 COLLATE latin1_general_ci',
+            'host_name'           => 'sho.name1 COLLATE latin1_general_ci',
+            'service_description' => 'sho.name2 COLLATE latin1_general_ci',
+            'timestamp'           => 'UNIX_TIMESTAMP(sh.state_time)'
+        ),
+
+        'servicegroups' => array(
+            'servicegroup' => 'sgo.name1'
+        ),
+
+        'hostgroups' => array(
+            'hostgroup'  => 'hgo.name1'
         )
     );
 
@@ -35,8 +49,42 @@ class StateHistorySummaryQuery extends IdoQuery
             array('sho' => $this->prefix . 'objects'),
             'sh.object_id = sho.object_id AND sho.is_active = 1',
             array()
-        )->where('sh.state_time >= ?', '2013-11-20 00:00:00')
+        )
         ->group('DATE(sh.state_time)');
         $this->joinedVirtualTables = array('statehistory' => true);
     }
+
+    protected function joinHostgroups()
+    {
+        $this->select->join(
+            array('hgm' => $this->prefix . 'hostgroup_members'),
+            'hgm.host_object_id = sho.object_id',
+            array()
+        )->join(
+            array('hgs' => $this->prefix . 'hostgroups'),
+            'hgm.hostgroup_id = hgs.hostgroup_id',
+            array()
+        )->join(
+            array('hgo' => $this->prefix . 'objects'),
+            'hgo.object_id = hgs.hostgroup_object_id',
+            array()
+        );
+    }
+
+    protected function joinServicegroups()
+    {
+        $this->select->join(
+            array('sgm' => $this->prefix . 'servicegroup_members'),
+            'sgm.service_object_id = sho.object_id',
+            array()
+        )->join(
+            array('sgs' => $this->prefix . 'servicegroups'),
+            'sgm.servicegroup_id = sgs.servicegroup_id',
+            array()
+        )->join(
+            array('sgo' => $this->prefix . 'objects'),
+            'sgo.object_id = sgs.servicegroup_object_id',
+            array()
+        );
+    }
 }