diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php
index 28b4d034a..24f7e885e 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php
@@ -97,7 +97,6 @@ class HostdowntimestarthistoryQuery extends IdoQuery
         }
 
         $this->joinedVirtualTables['downtimehistory'] = true;
-        $this->joinedVirtualTables['history'] = true;
     }
 
     /**
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatehistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatehistoryQuery.php
index 533819cdc..8a29b6a4a 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatehistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatehistoryQuery.php
@@ -80,7 +80,7 @@ class HoststatehistoryQuery extends IdoQuery
         if ($col === 'UNIX_TIMESTAMP(hh.state_time)') {
             return 'hh.state_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression));
         } elseif (
-            $col === $this->columnMap['history']['type']
+            $col === $this->columnMap['statehistory']['type']
             && ! is_array($expression)
             && array_key_exists($expression, $this->types)
         ) {
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php
index d9cc7ca44..e3932bc77 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php
@@ -16,7 +16,7 @@ class ServicedowntimeQuery extends IdoQuery
     /**
      * {@inheritdoc}
      */
-    protected $groupBase = array('downtimes', array('sd.scheduleddowntime_id', 'so.object_id'));
+    protected $groupBase = array('downtimes' => array('sd.scheduleddowntime_id', 'so.object_id'));
 
     /**
      * {@inheritdoc}
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php
index 39c185b92..ab983d775 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php
@@ -16,7 +16,7 @@ class ServicedowntimestarthistoryQuery extends IdoQuery
     /**
      * {@inheritdoc}
      */
-    protected $groupBase = array('downtimehistory', array('sdh.downtimehistory_id', 'so.object_id'));
+    protected $groupBase = array('downtimehistory' => array('sdh.downtimehistory_id', 'so.object_id'));
 
     /**
      * {@inheritdoc}
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php
index f9113d433..66b3ac650 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php
@@ -16,7 +16,7 @@ class ServicestatehistoryQuery extends IdoQuery
     /**
      * {@inheritdoc}
      */
-    protected $groupBase = array('statehistory', array('sh.statehistory_id', 'so.object_id'));
+    protected $groupBase = array('statehistory' => array('sh.statehistory_id', 'so.object_id'));
 
     /**
      * {@inheritdoc}
@@ -81,7 +81,7 @@ class ServicestatehistoryQuery extends IdoQuery
         if ($col === 'UNIX_TIMESTAMP(sh.state_time)') {
             return 'sh.state_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression));
         } elseif (
-            $col === $this->columnMap['history']['type']
+            $col === $this->columnMap['statehistory']['type']
             && ! is_array($expression)
             && array_key_exists($expression, $this->types)
         ) {