diff -Nru icingaweb2-2.7.1/application/VERSION icingaweb2-2.7.3/application/VERSION
--- icingaweb2-2.7.1/application/VERSION	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/application/VERSION	2019-10-18 05:39:24.000000000 +0000
@@ -1 +1 @@
-b0bf9c4b0637f6113adb788e78c2bcf619225dd8 2019-08-14 13:10:19 +0200
+06cabfe8ba28cf545a42c92f25484383191a4e51 2019-10-18 07:39:24 +0200
diff -Nru icingaweb2-2.7.1/CHANGELOG.md icingaweb2-2.7.3/CHANGELOG.md
--- icingaweb2-2.7.1/CHANGELOG.md	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/CHANGELOG.md	2019-10-18 05:39:24.000000000 +0000
@@ -4,6 +4,40 @@
 
 ## What's New
 
+### What's New in Version 2.7.3
+
+This is a hotfix release and fixes the following issue:
+
+* Servicegroups for roles with filtered objects not available [#3983](https://github.com/Icinga/icingaweb2/issues/3983)
+
+### What's New in Version 2.7.2
+
+You can find all issues related to this release on our [Roadmap](https://github.com/Icinga/icingaweb2/milestone/57?closed=1).
+
+#### Less Smoky Database Servers
+
+The release of v2.7.1 introduced a change which revealed an inefficient part of our database queries. We made some
+general optimizations on our queries and changed the way we utilize them in some views. The result are faster
+response times by less work for the database server.
+
+* Consuming more CPU resources since upgraded to 2.7.1 [#3928](https://github.com/Icinga/icingaweb2/issues/3928)
+
+#### Anarchism Infested Dashboards
+
+Recent history already showed signs of anarchism. (Pun intended) A similar mindset now infested default dashboards
+which appeared in a different way than before v2.7.0. We taught their dashlets a lesson and order has been reestablished
+as previously.
+
+* Recently Recovered Services in dashboard "Current Incidents" seems out of order [#3931](https://github.com/Icinga/icingaweb2/issues/3931)
+
+#### Solitary Downtimes
+
+We improved the host and service distinction with v2.7.0. The downtimes list however got confused by this and didn't
+knew anymore how to combine multiple downtimes. If you now instruct the list to select multiple downtimes this works
+again as we removed the confusing parts.
+
+* Selection of multiple downtimes fails [#3920](https://github.com/Icinga/icingaweb2/issues/3920)
+
 ### What's New in Version 2.7.1
 
 You can find all issues related to this release on our [Roadmap](https://github.com/Icinga/icingaweb2/milestone/56?closed=1).
diff -Nru icingaweb2-2.7.1/debian/changelog icingaweb2-2.7.3/debian/changelog
--- icingaweb2-2.7.1/debian/changelog	2019-08-16 04:37:28.000000000 +0000
+++ icingaweb2-2.7.3/debian/changelog	2019-10-19 05:35:47.000000000 +0000
@@ -1,3 +1,11 @@
+icingaweb2 (2.7.3-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release.
+  * Bump Standards-Version to 4.4.1, no changes.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sat, 19 Oct 2019 07:35:47 +0200
+
 icingaweb2 (2.7.1-1) unstable; urgency=medium
 
   * Team upload.
diff -Nru icingaweb2-2.7.1/debian/control icingaweb2-2.7.3/debian/control
--- icingaweb2-2.7.1/debian/control	2019-07-11 16:33:57.000000000 +0000
+++ icingaweb2-2.7.3/debian/control	2019-09-30 18:07:09.000000000 +0000
@@ -8,7 +8,7 @@
                php-cli,
                node-uglify (>= 2) | yui-compressor,
                node-source-map | yui-compressor
-Standards-Version: 4.4.0
+Standards-Version: 4.4.1
 Vcs-Browser: https://salsa.debian.org/nagios-team/pkg-icingaweb2
 Vcs-Git: https://salsa.debian.org/nagios-team/pkg-icingaweb2.git
 Homepage: https://icinga.com
diff -Nru icingaweb2-2.7.1/library/Icinga/Application/Modules/DashboardContainer.php icingaweb2-2.7.3/library/Icinga/Application/Modules/DashboardContainer.php
--- icingaweb2-2.7.1/library/Icinga/Application/Modules/DashboardContainer.php	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/library/Icinga/Application/Modules/DashboardContainer.php	2019-10-18 05:39:24.000000000 +0000
@@ -43,12 +43,16 @@
      *
      * @param   string  $name
      * @param   string  $url
+     * @param   int     $priority
      *
      * @return  $this
      */
-    public function add($name, $url)
+    public function add($name, $url, $priority = null)
     {
-        $this->dashlets[$name] = $url;
+        $this->dashlets[$name] = [
+            'url'       => $url,
+            'priority'  => $priority
+        ];
         return $this;
     }
 }
diff -Nru icingaweb2-2.7.1/library/Icinga/Application/Modules/Module.php icingaweb2-2.7.3/library/Icinga/Application/Modules/Module.php
--- icingaweb2-2.7.1/library/Icinga/Application/Modules/Module.php	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/library/Icinga/Application/Modules/Module.php	2019-10-18 05:39:24.000000000 +0000
@@ -315,10 +315,11 @@
         foreach ($panes as $pane) {
             /** @var DashboardContainer $pane */
             $dashlets = [];
-            foreach ($pane->getDashlets() as $dashletName => $dashletUrl) {
+            foreach ($pane->getDashlets() as $dashletName => $dashletConfig) {
                 $dashlets[$dashletName] = [
-                    'label' => $this->translate($dashletName),
-                    'url'   => $dashletUrl
+                    'label'     => $this->translate($dashletName),
+                    'url'       => $dashletConfig['url'],
+                    'priority'  => $dashletConfig['priority']
                 ];
             }
 
diff -Nru icingaweb2-2.7.1/library/Icinga/Application/Version.php icingaweb2-2.7.3/library/Icinga/Application/Version.php
--- icingaweb2-2.7.1/library/Icinga/Application/Version.php	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/library/Icinga/Application/Version.php	2019-10-18 05:39:24.000000000 +0000
@@ -8,7 +8,7 @@
  */
 class Version
 {
-    const VERSION = '2.7.1';
+    const VERSION = '2.7.3';
 
     /**
      * Get the version of this instance of Icinga Web 2
diff -Nru icingaweb2-2.7.1/library/Icinga/Data/SimpleQuery.php icingaweb2-2.7.3/library/Icinga/Data/SimpleQuery.php
--- icingaweb2-2.7.1/library/Icinga/Data/SimpleQuery.php	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/library/Icinga/Data/SimpleQuery.php	2019-10-18 05:39:24.000000000 +0000
@@ -37,6 +37,13 @@
     protected $iteratorPosition;
 
     /**
+     * The amount of rows previously calculated
+     *
+     * @var int
+     */
+    protected $cachedCount;
+
+    /**
      * The target you are going to query
      *
      * @var mixed
@@ -450,7 +457,7 @@
      */
     public function hasResult()
     {
-        return $this->iteratorPosition !== null || $this->fetchRow() !== false;
+        return $this->cachedCount > 0 || $this->iteratorPosition !== null || $this->fetchRow() !== false;
     }
 
     /**
@@ -647,6 +654,7 @@
         $query->limit(0, 0);
         Benchmark::measure('Counting all results started');
         $count = $this->ds->count($query);
+        $this->cachedCount = $count;
         Benchmark::measure('Counting all results finished');
         return $count;
     }
diff -Nru icingaweb2-2.7.1/modules/doc/module.info icingaweb2-2.7.3/modules/doc/module.info
--- icingaweb2-2.7.1/modules/doc/module.info	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/modules/doc/module.info	2019-10-18 05:39:24.000000000 +0000
@@ -1,4 +1,4 @@
 Module: doc
-Version: 2.7.1
+Version: 2.7.3
 Description: Documentation module
  Extracts, shows and exports documentation for Icinga Web 2 and its modules.
diff -Nru icingaweb2-2.7.1/modules/migrate/module.info icingaweb2-2.7.3/modules/migrate/module.info
--- icingaweb2-2.7.1/modules/migrate/module.info	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/modules/migrate/module.info	2019-10-18 05:39:24.000000000 +0000
@@ -1,5 +1,5 @@
 Module: migrate
-Version: 2.7.1
+Version: 2.7.3
 Description: Migrate module
  This module was introduced with the domain-aware authentication feature in version 2.5.0.
  It helps you migrating users and user configurations according to a given domain.
diff -Nru icingaweb2-2.7.1/modules/monitoring/application/controllers/EventController.php icingaweb2-2.7.3/modules/monitoring/application/controllers/EventController.php
--- icingaweb2-2.7.1/modules/monitoring/application/controllers/EventController.php	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/modules/monitoring/application/controllers/EventController.php	2019-10-18 05:39:24.000000000 +0000
@@ -339,7 +339,7 @@
             case 'dt_start':
             case 'dt_end':
                 $details = array(array(
-                    array($this->translate('Entry time'), DateFormatter::formatTime($event->entry_time)),
+                    array($this->translate('Entry time'), DateFormatter::formatDateTime($event->entry_time)),
                     array($this->translate('Is fixed'), $this->yesOrNo($event->is_fixed)),
                     array($this->translate('Is in effect'), $this->yesOrNo($event->is_in_effect)),
                     array($this->translate('Was started'), $this->yesOrNo($event->was_started))
@@ -352,18 +352,18 @@
                 }
 
                 $details[] = array(
-                    array($this->translate('Trigger time'), DateFormatter::formatTime($event->trigger_time)),
+                    array($this->translate('Trigger time'), DateFormatter::formatDateTime($event->trigger_time)),
                     array(
                         $this->translate('Scheduled start time'),
-                        DateFormatter::formatTime($event->scheduled_start_time)
+                        DateFormatter::formatDateTime($event->scheduled_start_time)
                     ),
                     array(
                         $this->translate('Actual start time'),
-                        DateFormatter::formatTime($event->actual_start_time)
+                        DateFormatter::formatDateTime($event->actual_start_time)
                     ),
                     array(
                         $this->translate('Scheduled end time'),
-                        DateFormatter::formatTime($event->scheduled_end_time)
+                        DateFormatter::formatDateTime($event->scheduled_end_time)
                     )
                 );
 
@@ -371,7 +371,7 @@
                     $details[] = array(
                         array(
                             $this->translate('Actual end time'),
-                            DateFormatter::formatTime($event->actual_end_time)
+                            DateFormatter::formatDateTime($event->actual_end_time)
                         )
                     );
                 }
@@ -417,14 +417,14 @@
                 }
 
                 return array(
-                    array($this->translate('Time'), DateFormatter::formatTime($event->comment_time)),
+                    array($this->translate('Time'), DateFormatter::formatDateTime($event->comment_time)),
                     array($this->translate('Source'), $this->view->escape($commentSource)),
                     array($this->translate('Entry type'), $this->view->escape($entryType)),
                     array($this->translate('Author'), $this->contact($event->author_name)),
                     array($this->translate('Is persistent'), $this->yesOrNo($event->is_persistent)),
                     array($this->translate('Expires'), $this->yesOrNo($event->expires)),
-                    array($this->translate('Expiration time'), DateFormatter::formatTime($event->expiration_time)),
-                    array($this->translate('Deletion time'), DateFormatter::formatTime($event->deletion_time)),
+                    array($this->translate('Expiration time'), DateFormatter::formatDateTime($event->expiration_time)),
+                    array($this->translate('Deletion time'), DateFormatter::formatDateTime($event->deletion_time)),
                     array($this->translate('Message'), $this->comment($event->comment_data))
                 );
             case 'flapping':
@@ -441,7 +441,7 @@
                 }
 
                 return array(
-                    array($this->translate('Event time'), DateFormatter::formatTime($event->event_time)),
+                    array($this->translate('Event time'), DateFormatter::formatDateTime($event->event_time)),
                     array($this->translate('Reason'), $this->view->escape($reasonType)),
                     array($this->translate('State change'), $this->percent($event->percent_state_change)),
                     array($this->translate('Low threshold'), $this->percent($event->low_threshold)),
@@ -481,8 +481,8 @@
                 }
 
                 $details = array(
-                    array($this->translate('Start time'), DateFormatter::formatTime($event->start_time)),
-                    array($this->translate('End time'), DateFormatter::formatTime($event->end_time)),
+                    array($this->translate('Start time'), DateFormatter::formatDateTime($event->start_time)),
+                    array($this->translate('End time'), DateFormatter::formatDateTime($event->end_time)),
                     array($this->translate('Reason'), $this->view->escape($notificationReason)),
                     array(
                         $this->translate('State'),
@@ -502,7 +502,7 @@
                 $isService = $event->service_description !== null;
 
                 $details = array(
-                    array($this->translate('State time'), DateFormatter::formatTime($event->state_time)),
+                    array($this->translate('State time'), DateFormatter::formatDateTime($event->state_time)),
                     array($this->translate('State'), $this->state($isService, $event->state)),
                     array($this->translate('Check source'), $event->check_source),
                     array($this->translate('Check attempt'), $this->view->escape(sprintf(
diff -Nru icingaweb2-2.7.1/modules/monitoring/application/controllers/ListController.php icingaweb2-2.7.3/modules/monitoring/application/controllers/ListController.php
--- icingaweb2-2.7.1/modules/monitoring/application/controllers/ListController.php	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/modules/monitoring/application/controllers/ListController.php	2019-10-18 05:39:24.000000000 +0000
@@ -374,7 +374,7 @@
         $this->params->remove(array('objecttype', 'from', 'to', 'state', 'btn_submit'));
         $this->view->filter = Filter::fromQuerystring((string) $this->params);
         $query->applyFilter($this->view->filter);
-        $query->applyFilter(Filter::fromQuerystring('timestamp >= ' . $from));
+        $query->applyFilter(Filter::fromQuerystring('timestamp>=' . $from));
         $this->applyRestriction('monitoring/filter/objects', $query);
         $this->view->summary = $query;
         $this->view->column = $form->getValue('state');
diff -Nru icingaweb2-2.7.1/modules/monitoring/application/controllers/TimelineController.php icingaweb2-2.7.3/modules/monitoring/application/controllers/TimelineController.php
--- icingaweb2-2.7.1/modules/monitoring/application/controllers/TimelineController.php	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/modules/monitoring/application/controllers/TimelineController.php	2019-10-18 05:39:24.000000000 +0000
@@ -46,10 +46,47 @@
                 )
             ),
             array(
-                'notify'        => array(
-                    'class'     => 'timeline-notification',
-                    'detailUrl' => $detailUrl,
-                    'label'     => mt('monitoring', 'Notifications')
+                'notification_ack'  => array(
+                    'class'         => 'timeline-notification',
+                    'detailUrl'     => $detailUrl,
+                    'label'         => mt('monitoring', 'Notifications'),
+                    'groupBy'       => 'notification_*'
+                ),
+                'notification_flapping'  => array(
+                    'class'         => 'timeline-notification',
+                    'detailUrl'     => $detailUrl,
+                    'label'         => mt('monitoring', 'Notifications'),
+                    'groupBy'       => 'notification_*'
+                ),
+                'notification_flapping_end'  => array(
+                    'class'         => 'timeline-notification',
+                    'detailUrl'     => $detailUrl,
+                    'label'         => mt('monitoring', 'Notifications'),
+                    'groupBy'       => 'notification_*'
+                ),
+                'notification_dt_start'  => array(
+                    'class'         => 'timeline-notification',
+                    'detailUrl'     => $detailUrl,
+                    'label'         => mt('monitoring', 'Notifications'),
+                    'groupBy'       => 'notification_*'
+                ),
+                'notification_dt_end'  => array(
+                    'class'         => 'timeline-notification',
+                    'detailUrl'     => $detailUrl,
+                    'label'         => mt('monitoring', 'Notifications'),
+                    'groupBy'       => 'notification_*'
+                ),
+                'notification_custom'  => array(
+                    'class'         => 'timeline-notification',
+                    'detailUrl'     => $detailUrl,
+                    'label'         => mt('monitoring', 'Notifications'),
+                    'groupBy'       => 'notification_*'
+                ),
+                'notification_state'  => array(
+                    'class'         => 'timeline-notification',
+                    'detailUrl'     => $detailUrl,
+                    'label'         => mt('monitoring', 'Notifications'),
+                    'groupBy'       => 'notification_*'
                 ),
                 'hard_state'    => array(
                     'class'     => 'timeline-hard-state',
diff -Nru icingaweb2-2.7.1/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php icingaweb2-2.7.3/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
--- icingaweb2-2.7.1/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php	2019-10-18 05:39:24.000000000 +0000
@@ -80,17 +80,25 @@
                 $options['description'] = $this->translate('changed');
             }
             if ($formData[$feature] === 2) {
-                $options['multiOptions'] = array(
-                    $this->translate('disable'),
-                    $this->translate('enable'),
-                );
-                $options['separator'] = '';
-                $elementType = 'radio';
+                $this->addElement('select', $feature, $options + [
+                    'description'   => $this->translate('Multiple Values'),
+                    'filters'       => [['Null', ['type' => \Zend_Filter_Null::STRING]]],
+                    'multiOptions'  => [
+                        '' => $this->translate('Leave Unchanged'),
+                        $this->translate('Disable All'),
+                        $this->translate('Enable All')
+                    ],
+                    'decorators'    => array_merge(
+                        array_slice(static::$defaultElementDecorators, 0, 3),
+                        [['Description', ['tag' => 'span']]],
+                        array_slice(static::$defaultElementDecorators, 4, 1),
+                        [['HtmlTag', ['tag' => 'div', 'class' => 'control-group indeterminate']]]
+                    )
+                ]);
             } else {
-                $elementType = 'checkbox';
                 $options['value'] = $formData[$feature];
+                $this->addElement('checkbox', $feature, $options);
             }
-            $this->addElement($elementType, $feature, $options);
         }
     }
 
diff -Nru icingaweb2-2.7.1/modules/monitoring/application/views/helpers/PluginOutput.php icingaweb2-2.7.3/modules/monitoring/application/views/helpers/PluginOutput.php
--- icingaweb2-2.7.1/modules/monitoring/application/views/helpers/PluginOutput.php	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/modules/monitoring/application/views/helpers/PluginOutput.php	2019-10-18 05:39:24.000000000 +0000
@@ -3,7 +3,7 @@
 
 use Icinga\Web\Dom\DomNodeIterator;
 use Icinga\Web\View;
-use Icinga\Module\Monitoring\Web\Helper\PluginOutputPurifier;
+use Icinga\Web\Helper\HtmlPurifier;
 
 /**
  * Plugin output renderer
@@ -11,13 +11,6 @@
 class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
 {
     /**
-     * The return value of getPurifier()
-     *
-     * @var HTMLPurifier
-     */
-    protected static $purifier;
-
-    /**
      * Patterns to be replaced in plain text plugin output
      *
      * @var array
@@ -107,7 +100,7 @@
             $output = preg_replace(
                 self::$htmlPatterns,
                 self::$htmlReplacements,
-                PluginOutputPurifier::process($output)
+                HtmlPurifier::process($output)
             );
             $isHtml = true;
         } else {
diff -Nru icingaweb2-2.7.1/modules/monitoring/application/views/scripts/list/servicegrid-flipped.phtml icingaweb2-2.7.3/modules/monitoring/application/views/scripts/list/servicegrid-flipped.phtml
--- icingaweb2-2.7.1/modules/monitoring/application/views/scripts/list/servicegrid-flipped.phtml	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/modules/monitoring/application/views/scripts/list/servicegrid-flipped.phtml	2019-10-18 05:39:24.000000000 +0000
@@ -115,7 +115,7 @@
                         'data-base-target'  => '_self'
                     )
                 ) ?>
-                <?= ++$i === (int) (count($pivotHeader['rows']) / 2) ? $expandLink : '' ?>
+                <?= ++$i === (int) ceil(count($pivotHeader['rows']) / 2) ? $expandLink : '' ?>
             </td>
         <?php endif ?>
         </tr>
diff -Nru icingaweb2-2.7.1/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml icingaweb2-2.7.3/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
--- icingaweb2-2.7.1/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml	2019-10-18 05:39:24.000000000 +0000
@@ -15,8 +15,7 @@
                     $this->translate('Show detailed information for service %s on host %s'),
                     $comment->service_display_name,
                     $comment->host_display_name
-                ),
-                'class' => 'rowaction'
+                )
             ]
         ),
         $this->qlink(
diff -Nru icingaweb2-2.7.1/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml icingaweb2-2.7.3/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
--- icingaweb2-2.7.1/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml	2019-10-18 05:39:24.000000000 +0000
@@ -25,8 +25,7 @@
                         $this->translate('Show detailed information for service %s on host %s'),
                         $downtime->service_display_name,
                         $downtime->host_display_name
-                    ),
-                    'class' => 'rowaction'
+                    )
                 ]
             ),
             $this->qlink(
diff -Nru icingaweb2-2.7.1/modules/monitoring/application/views/scripts/partials/event-history.phtml icingaweb2-2.7.3/modules/monitoring/application/views/scripts/partials/event-history.phtml
--- icingaweb2-2.7.1/modules/monitoring/application/views/scripts/partials/event-history.phtml	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/modules/monitoring/application/views/scripts/partials/event-history.phtml	2019-10-18 05:39:24.000000000 +0000
@@ -29,19 +29,17 @@
 $history->limit($limit * $page);
 ?>
 <div class="content">
-<?php if (! $history->hasResult()): ?>
-    <p><?= $this->translate('No historical events found matching the filter.') ?></p>
-</div>
-<?php return; endif ?>
 <?php
 $dateFormat = $this->translate('%A, %B %e, %Y', 'date.verbose');
 $lastDate = null;
 $flappingMsg = $this->translate('Flapping with a %.2f%% state change rate');
 $rowAction = Url::fromPath('monitoring/event/show');
 ?>
+    <?php foreach ($history->peekAhead() as $event): ?>
+<?php if ($lastDate === null): ?>
     <table class="table-row-selectable state-table" data-base-target="_next">
-    <tbody>
-    <?php foreach ($history->peekAhead() as $event):
+        <tbody>
+<?php endif;
         $icon = '';
         $iconTitle = null;
         $isService = isset($event->service_description);
@@ -240,8 +238,10 @@
             </td>
         </tr>
         <?php endforeach ?>
+<?php if ($lastDate !== null): ?>
         </tbody>
     </table>
+<?php endif ?>
 <?php if ($history->hasMore()): ?>
     <div class="action-links">
     <?php if ($this->compact) {
diff -Nru icingaweb2-2.7.1/modules/monitoring/configuration.php icingaweb2-2.7.3/modules/monitoring/configuration.php
--- icingaweb2-2.7.1/modules/monitoring/configuration.php	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/modules/monitoring/configuration.php	2019-10-18 05:39:24.000000000 +0000
@@ -295,15 +295,18 @@
 $dashboard = $this->dashboard(N_('Current Incidents'), array('priority' => 50));
 $dashboard->add(
     N_('Service Problems'),
-    'monitoring/list/services?service_problem=1&limit=10&sort=service_severity'
+    'monitoring/list/services?service_problem=1&limit=10&sort=service_severity',
+    100
 );
 $dashboard->add(
     N_('Recently Recovered Services'),
-    'monitoring/list/services?service_state=0&limit=10&sort=service_last_state_change&dir=desc'
+    'monitoring/list/services?service_state=0&limit=10&sort=service_last_state_change&dir=desc',
+    110
 );
 $dashboard->add(
     N_('Host Problems'),
-    'monitoring/list/hosts?host_problem=1&sort=host_severity'
+    'monitoring/list/hosts?host_problem=1&sort=host_severity',
+    120
 );
 
 /*
@@ -329,19 +332,23 @@
 $dashboard = $this->dashboard(N_('Overdue'), array('priority' => 70));
 $dashboard->add(
     N_('Late Host Check Results'),
-    'monitoring/list/hosts?host_next_update<now'
+    'monitoring/list/hosts?host_next_update<now',
+    100
 );
 $dashboard->add(
     N_('Late Service Check Results'),
-    'monitoring/list/services?service_next_update<now'
+    'monitoring/list/services?service_next_update<now',
+    110
 );
 $dashboard->add(
     N_('Acknowledgements Active For At Least Three Days'),
-    'monitoring/list/comments?comment_type=Ack&comment_timestamp<-3 days&sort=comment_timestamp&dir=asc'
+    'monitoring/list/comments?comment_type=Ack&comment_timestamp<-3 days&sort=comment_timestamp&dir=asc',
+    120
 );
 $dashboard->add(
     N_('Downtimes Active For More Than Three Days'),
-    'monitoring/list/downtimes?downtime_is_in_effect=1&downtime_scheduled_start<-3%20days&sort=downtime_start&dir=asc'
+    'monitoring/list/downtimes?downtime_is_in_effect=1&downtime_scheduled_start<-3%20days&sort=downtime_start&dir=asc',
+    130
 );
 
 /*
@@ -350,27 +357,33 @@
 $dashboard = $this->dashboard(N_('Muted'), array('priority' => 80));
 $dashboard->add(
     N_('Disabled Service Notifications'),
-    'monitoring/list/services?service_notifications_enabled=0&limit=10'
+    'monitoring/list/services?service_notifications_enabled=0&limit=10',
+    100
 );
 $dashboard->add(
     N_('Disabled Host Notifications'),
-    'monitoring/list/hosts?host_notifications_enabled=0&limit=10'
+    'monitoring/list/hosts?host_notifications_enabled=0&limit=10',
+    110
 );
 $dashboard->add(
     N_('Disabled Service Checks'),
-    'monitoring/list/services?service_active_checks_enabled=0&limit=10'
+    'monitoring/list/services?service_active_checks_enabled=0&limit=10',
+    120
 );
 $dashboard->add(
     N_('Disabled Host Checks'),
-    'monitoring/list/hosts?host_active_checks_enabled=0&limit=10'
+    'monitoring/list/hosts?host_active_checks_enabled=0&limit=10',
+    130
 );
 $dashboard->add(
     N_('Acknowledged Problem Services'),
-    'monitoring/list/services?service_acknowledgement_type=2&service_problem=1&sort=service_state&limit=10'
+    'monitoring/list/services?service_acknowledgement_type=2&service_problem=1&sort=service_state&limit=10',
+    140
 );
 $dashboard->add(
     N_('Acknowledged Problem Hosts'),
-    'monitoring/list/hosts?host_acknowledgement_type=2&host_problem=1&sort=host_severity&limit=10'
+    'monitoring/list/hosts?host_acknowledgement_type=2&host_problem=1&sort=host_severity&limit=10',
+    150
 );
 
 /*
diff -Nru icingaweb2-2.7.1/modules/monitoring/library/Monitoring/Backend/Ido/Query/EmptyhostgroupQuery.php icingaweb2-2.7.3/modules/monitoring/library/Monitoring/Backend/Ido/Query/EmptyhostgroupQuery.php
--- icingaweb2-2.7.1/modules/monitoring/library/Monitoring/Backend/Ido/Query/EmptyhostgroupQuery.php	1970-01-01 00:00:00.000000000 +0000
+++ icingaweb2-2.7.3/modules/monitoring/library/Monitoring/Backend/Ido/Query/EmptyhostgroupQuery.php	2019-10-18 05:39:24.000000000 +0000
@@ -0,0 +1,38 @@
+<?php
+/* Icinga Web 2 | (c) 2019 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+
+class EmptyhostgroupQuery extends HostgroupQuery
+{
+    protected $subQueryTargets = [];
+
+    protected $columnMap = [
+        'hostgroups' => [
+            'hostgroup'             => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup_alias'       => 'hg.alias COLLATE latin1_general_ci',
+            'hostgroup_name'        => 'hgo.name1',
+            'host_name'             => '(NULL)',
+            'service_description'   => '(NULL)',
+            'servicegroup_name'     => '(NULL)',
+            'host_contact'          => '(NULL)',
+            'host_contactgroup'     => '(NULL)'
+        ],
+        'instances' => [
+            'instance_name'         => 'i.instance_name'
+        ]
+    ];
+
+    protected function joinBaseTables()
+    {
+        parent::joinBaseTables();
+
+        $this->select->joinLeft(
+            ['ehgm' => $this->prefix . 'hostgroup_members'],
+            'ehgm.hostgroup_id = hg.hostgroup_id',
+            []
+        );
+        $this->select->group(['hgo.object_id', 'hg.hostgroup_id']);
+        $this->select->having('COUNT(ehgm.hostgroup_member_id) = ?', 0);
+    }
+}
diff -Nru icingaweb2-2.7.1/modules/monitoring/library/Monitoring/Backend/Ido/Query/EmptyservicegroupQuery.php icingaweb2-2.7.3/modules/monitoring/library/Monitoring/Backend/Ido/Query/EmptyservicegroupQuery.php
--- icingaweb2-2.7.1/modules/monitoring/library/Monitoring/Backend/Ido/Query/EmptyservicegroupQuery.php	1970-01-01 00:00:00.000000000 +0000
+++ icingaweb2-2.7.3/modules/monitoring/library/Monitoring/Backend/Ido/Query/EmptyservicegroupQuery.php	2019-10-18 05:39:24.000000000 +0000
@@ -0,0 +1,51 @@
+<?php
+/* Icinga Web 2 | (c) 2019 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+
+class EmptyservicegroupQuery extends ServicegroupQuery
+{
+    protected $subQueryTargets = [];
+
+    protected $columnMap = [
+        'servicegroups' => [
+            'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
+            'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci',
+            'servicegroup_name'     => 'sgo.name1',
+            'host_name'             => '(NULL)',
+            'hostgroup_name'        => '(NULL)',
+            'service_description'   => '(NULL)',
+            'host_contact'          => '(NULL)',
+            'host_contactgroup'     => '(NULL)',
+            'service_contact'       => '(NULL)',
+            'service_contactgroup'  => '(NULL)'
+        ],
+        'instances' => [
+            'instance_name'         => 'i.instance_name'
+        ]
+    ];
+
+    protected function joinBaseTables()
+    {
+        parent::joinBaseTables();
+
+        $this->select->joinLeft(
+            ['esgm' => $this->prefix . 'servicegroup_members'],
+            'esgm.servicegroup_id = sg.servicegroup_id',
+            []
+        );
+        $this->select->group(['sgo.object_id', 'sg.servicegroup_id']);
+        $this->select->having('COUNT(esgm.servicegroup_member_id) = ?', 0);
+    }
+
+    protected function joinHosts()
+    {
+        parent::joinHosts();
+
+        $this->select->joinLeft(
+            ['h' => 'icinga_hosts'],
+            'h.host_object_id = s.host_object_id',
+            []
+        );
+    }
+}
diff -Nru icingaweb2-2.7.1/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php icingaweb2-2.7.3/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
--- icingaweb2-2.7.1/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php	2019-10-18 05:39:24.000000000 +0000
@@ -59,7 +59,7 @@
                         END
                     END
                 END',
-            'host_state'    => 'CASE WHEN hs.has_been_checked = 0 OR (hs.has_been_checked IS NULL AND hs.hoststatus_id IS NOT NULL) THEN 99 ELSE hs.current_state END'
+            'host_state'    => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END'
         ),
         'instances' => array(
             'instance_name' => 'i.instance_name'
@@ -112,7 +112,7 @@
                              END
                          END
                 END',
-            'service_state'     => 'CASE WHEN ss.has_been_checked = 0 OR (ss.has_been_checked IS NULL AND ss.servicestatus_id IS NOT NULL) THEN 99 ELSE ss.current_state END'
+            'service_state'     => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE ss.current_state END'
         )
     );
 
@@ -171,7 +171,7 @@
     protected function joinHosts()
     {
         $this->requireVirtualTable('members');
-        $this->select->joinLeft(
+        $this->select->join(
             array('h' => $this->prefix . 'hosts'),
             'h.host_object_id = ho.object_id',
             array()
@@ -184,7 +184,7 @@
     protected function joinHoststatus()
     {
         $this->requireVirtualTable('members');
-        $this->select->joinLeft(
+        $this->select->join(
             array('hs' => $this->prefix . 'hoststatus'),
             'hs.host_object_id = ho.object_id',
             array()
@@ -196,7 +196,7 @@
      */
     protected function joinInstances()
     {
-        $this->select->joinLeft(
+        $this->select->join(
             array('i' => $this->prefix . 'instances'),
             'i.instance_id = hg.instance_id',
             array()
@@ -208,11 +208,11 @@
      */
     protected function joinMembers()
     {
-        $this->select->joinLeft(
+        $this->select->join(
             array('hgm' => $this->prefix . 'hostgroup_members'),
             'hgm.hostgroup_id = hg.hostgroup_id',
             array()
-        )->joinLeft(
+        )->join(
             array('ho' => $this->prefix . 'objects'),
             'hgm.host_object_id = ho.object_id AND ho.is_active = 1 AND ho.objecttype_id = 1',
             array()
@@ -225,15 +225,15 @@
     protected function joinServicegroups()
     {
         $this->requireVirtualTable('services');
-        $this->select->joinLeft(
+        $this->select->join(
             array('sgm' => $this->prefix . 'servicegroup_members'),
             'sgm.service_object_id = s.service_object_id',
             array()
-        )->joinLeft(
+        )->join(
             array('sg' => $this->prefix . 'servicegroups'),
             'sgm.servicegroup_id = sg.servicegroup_id',
             array()
-        )->joinLeft(
+        )->join(
             array('sgo' => $this->prefix . 'objects'),
             'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
@@ -246,11 +246,11 @@
     protected function joinServices()
     {
         $this->requireVirtualTable('hosts');
-        $this->select->joinLeft(
+        $this->select->join(
             array('s' => $this->prefix . 'services'),
             's.host_object_id = h.host_object_id',
             array()
-        )->joinLeft(
+        )->join(
             array('so' => $this->prefix . 'objects'),
             'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
@@ -264,7 +264,7 @@
     {
         $this->requireVirtualTable('services');
         $this->requireVirtualTable('hoststatus');
-        $this->select->joinLeft(
+        $this->select->join(
             array('ss' => $this->prefix . 'servicestatus'),
             'ss.service_object_id = so.object_id',
             array()
diff -Nru icingaweb2-2.7.1/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php icingaweb2-2.7.3/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php
--- icingaweb2-2.7.1/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php	2019-10-18 05:39:24.000000000 +0000
@@ -108,7 +108,24 @@
             )
         );
         $this->subQueries[] = $services;
-        $this->summaryQuery = $this->db->select()->union(array($hosts, $services), Zend_Db_Select::SQL_UNION_ALL);
+        $emptyGroups = $this->createSubQuery(
+            'Emptyhostgroup',
+            [
+                'hostgroup_alias',
+                'hostgroup_name',
+                'host_handled'      => new Zend_Db_Expr('NULL'),
+                'host_severity'     => new Zend_Db_Expr('0'),
+                'host_state'        => new Zend_Db_Expr('NULL'),
+                'service_handled'   => new Zend_Db_Expr('NULL'),
+                'service_severity'  => new Zend_Db_Expr('0'),
+                'service_state'     => new Zend_Db_Expr('NULL'),
+            ]
+        );
+        $this->subQueries[] = $emptyGroups;
+        $this->summaryQuery = $this->db->select()->union(
+            [$hosts, $services, $emptyGroups],
+            Zend_Db_Select::SQL_UNION_ALL
+        );
         $this->select->from(array('hostgroupsummary' => $this->summaryQuery), array());
         $this->group(array('hostgroup_name', 'hostgroup_alias'));
         $this->joinedVirtualTables['hostgroupsummary'] = true;
diff -Nru icingaweb2-2.7.1/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php icingaweb2-2.7.3/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
--- icingaweb2-2.7.1/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php	2019-10-18 05:39:24.000000000 +0000
@@ -101,17 +101,17 @@
             'host_next_notification'                => 'UNIX_TIMESTAMP(hs.next_notification)',
             'host_next_update'                      => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL
             THEN
-                NULL
+                CASE hs.should_be_scheduled WHEN 1 THEN UNIX_TIMESTAMP(hs.next_check) + (hs.normal_check_interval * 60) ELSE NULL END
             ELSE
-                UNIX_TIMESTAMP(hs.last_check)
+                UNIX_TIMESTAMP(hs.next_check)
                 + (CASE WHEN
                     COALESCE(hs.current_state, 0) > 0 AND hs.state_type = 0
                 THEN
                     hs.retry_check_interval
                 ELSE
                     hs.normal_check_interval
-                END * 60
-                + CEIL(hs.execution_time) + CEIL(hs.latency)) * 2
+                END * 60)
+                + (CEIL(hs.execution_time + hs.latency) * 2)
             END',
             'host_no_more_notifications'            => 'hs.no_more_notifications',
             'host_normal_check_interval'            => 'hs.normal_check_interval',
diff -Nru icingaweb2-2.7.1/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php icingaweb2-2.7.3/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
--- icingaweb2-2.7.1/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php	2019-10-18 05:39:24.000000000 +0000
@@ -633,12 +633,6 @@
             new Zend_Db_Expr($ours)
         ));
 
-        if (! $negate) {
-            $subQueryFilter = $subQueryFilter->orFilter(
-                new FilterExpression($ours, '', new Zend_Db_Expr('IS NULL'))
-            );
-        }
-
         $subQuery
             ->setFilter($subQueryFilter)
             ->clearGroupingRules()
diff -Nru icingaweb2-2.7.1/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php icingaweb2-2.7.3/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
--- icingaweb2-2.7.1/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php	2019-10-18 05:39:24.000000000 +0000
@@ -89,7 +89,7 @@
                              END
                          END
                 END',
-            'service_state'     => 'CASE WHEN ss.has_been_checked = 0 OR (ss.has_been_checked IS NULL AND ss.servicestatus_id IS NOT NULL) THEN 99 ELSE ss.current_state END'
+            'service_state'     => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE ss.current_state END'
         )
     );
 
@@ -192,15 +192,15 @@
     protected function joinHostgroups()
     {
         $this->requireVirtualTable('services');
-        $this->select->joinLeft(
+        $this->select->join(
             array('hgm' => $this->prefix . 'hostgroup_members'),
             'hgm.host_object_id = s.host_object_id',
             array()
-        )->joinLeft(
+        )->join(
             array('hg' => $this->prefix . 'hostgroups'),
             'hg.hostgroup_id = hgm.hostgroup_id',
             array()
-        )->joinLeft(
+        )->join(
             array('hgo' => $this->prefix . 'objects'),
             'hgo.object_id = hg.hostgroup_object_id AND hgo.objecttype_id = 3 AND hgo.is_active = 1',
             array()
@@ -225,7 +225,7 @@
      */
     protected function joinInstances()
     {
-        $this->select->joinLeft(
+        $this->select->join(
             array('i' => $this->prefix . 'instances'),
             'i.instance_id = sg.instance_id',
             array()
@@ -237,11 +237,11 @@
      */
     protected function joinMembers()
     {
-        $this->select->joinLeft(
+        $this->select->join(
             array('sgm' => $this->prefix . 'servicegroup_members'),
             'sgm.servicegroup_id = sg.servicegroup_id',
             array()
-        )->joinLeft(
+        )->join(
             array('so' => $this->prefix . 'objects'),
             'so.object_id = sgm.service_object_id AND so.objecttype_id = 2 AND so.is_active = 1',
             array()
@@ -254,7 +254,7 @@
     protected function joinServices()
     {
         $this->requireVirtualTable('members');
-        $this->select->joinLeft(
+        $this->select->join(
             array('s' => $this->prefix . 'services'),
             's.service_object_id = so.object_id',
             array()
@@ -267,12 +267,12 @@
     protected function joinServicestatus()
     {
         $this->requireVirtualTable('services');
-        $this->select->joinLeft(
+        $this->select->join(
             array('hs' => $this->prefix . 'hoststatus'),
             'hs.host_object_id = s.host_object_id',
             array()
         );
-        $this->select->joinLeft(
+        $this->select->join(
             array('ss' => $this->prefix . 'servicestatus'),
             'ss.service_object_id = so.object_id',
             array()
diff -Nru icingaweb2-2.7.1/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php icingaweb2-2.7.3/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php
--- icingaweb2-2.7.1/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php	2019-10-18 05:39:24.000000000 +0000
@@ -4,6 +4,8 @@
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
 use Icinga\Data\Filter\Filter;
+use Zend_Db_Expr;
+use Zend_Db_Select;
 
 /**
  * Query for service group summary
@@ -23,7 +25,7 @@
             'services_ok'                                   => 'SUM(CASE WHEN service_state = 0 THEN 1 ELSE 0 END)',
             'services_pending'                              => 'SUM(CASE WHEN service_state = 99 THEN 1 ELSE 0 END)',
             'services_severity'                             => 'MAX(service_severity)',
-            'services_total'                                => 'SUM(CASE WHEN service_state IS NOT NULL THEN 1 ELSE 0 END)',
+            'services_total'                                => 'SUM(1)',
             'services_unknown'                              => 'SUM(CASE WHEN service_state = 3 THEN 1 ELSE 0 END)',
             'services_unknown_handled'                      => 'SUM(CASE WHEN service_state = 3 AND service_handled = 1 THEN 1 ELSE 0 END)',
             'services_unknown_unhandled'                    => 'SUM(CASE WHEN service_state = 3 AND service_handled = 0 THEN 1 ELSE 0 END)',
@@ -34,11 +36,18 @@
     );
 
     /**
-     * Subquery used for the summary query
+     * The union
      *
-     * @var IdoQuery
+     * @var Zend_Db_Select
+     */
+    protected $summaryQuery;
+
+    /**
+     * Subqueries used for the summary query
+     *
+     * @var IdoQuery[]
      */
-    protected $subQuery;
+    protected $subQueries = [];
 
     /**
      * Count query
@@ -49,7 +58,9 @@
 
     public function addFilter(Filter $filter)
     {
-        $this->subQuery->applyFilter(clone $filter);
+        foreach ($this->subQueries as $sub) {
+            $sub->applyFilter(clone $filter);
+        }
         $this->countQuery->applyFilter(clone $filter);
         return $this;
     }
@@ -70,10 +81,24 @@
                 'service_state'
             )
         );
-        $subQuery->setIsSubQuery();
-        $this->subQuery = $subQuery;
-        $this->select->from(array('servicesgroupsummary' => $this->subQuery), array());
-        $this->group(array('servicegroup_name', 'servicegroup_alias'));
+        $this->subQueries[] = $subQuery;
+        $emptyGroups = $this->createSubQuery(
+            'Emptyservicegroup',
+            [
+                'servicegroup_alias',
+                'servicegroup_name',
+                'service_handled'   => new Zend_Db_Expr('NULL'),
+                'service_severity'  => new Zend_Db_Expr('0'),
+                'service_state'     => new Zend_Db_Expr('NULL'),
+            ]
+        );
+        $this->subQueries[] = $emptyGroups;
+        $this->summaryQuery = $this->db->select()->union(
+            [$subQuery, $emptyGroups],
+            Zend_Db_Select::SQL_UNION_ALL
+        );
+        $this->select->from(['servicesgroupsummary' => $this->summaryQuery], []);
+        $this->group(['servicegroup_name', 'servicegroup_alias']);
         $this->joinedVirtualTables['servicegroupsummary'] = true;
     }
 
diff -Nru icingaweb2-2.7.1/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php icingaweb2-2.7.3/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
--- icingaweb2-2.7.1/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php	2019-10-18 05:39:24.000000000 +0000
@@ -213,17 +213,17 @@
             'service_next_notification'                 => 'UNIX_TIMESTAMP(ss.next_notification)',
             'service_next_update'                       => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL
             THEN
-                NULL
+                CASE ss.should_be_scheduled WHEN 1 THEN UNIX_TIMESTAMP(ss.next_check) + (ss.normal_check_interval * 60) ELSE NULL END
             ELSE
-                UNIX_TIMESTAMP(ss.last_check)
+                UNIX_TIMESTAMP(ss.next_check)
                 + (CASE WHEN
                     COALESCE(ss.current_state, 0) > 0 AND ss.state_type = 0
                 THEN
                     ss.retry_check_interval
                 ELSE
                     ss.normal_check_interval
-                END * 60
-                + CEIL(ss.execution_time) + CEIL(ss.latency)) * 2
+                END * 60)
+                + (CEIL(ss.execution_time + ss.latency) * 2)
             END',
             'service_no_more_notifications'             => 'ss.no_more_notifications',
             'service_normal_check_interval'             => 'ss.normal_check_interval',
diff -Nru icingaweb2-2.7.1/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php icingaweb2-2.7.3/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
--- icingaweb2-2.7.1/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php	2019-10-18 05:39:24.000000000 +0000
@@ -58,10 +58,24 @@
     {
         return array(
             'instance_name',
-            'host', 'host_alias', 'host_contact', 'host_contactgroup', 'host_display_name', 'host_name',
+            'host_contact', 'host_contactgroup', 'host_name',
             'hostgroup',
-            'service', 'service_description', 'service_display_name',
-            'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+            'service_description',
+            'servicegroup_name'
         );
     }
+
+    public function getFilterColumns()
+    {
+        if ($this->filterColumns === null) {
+            $filterColumns = parent::getFilterColumns();
+            $diff = array_diff($filterColumns, $this->getColumns());
+            $this->filterColumns = array_merge($diff, [
+                'Hostgroup Name'    => 'hostgroup_name',
+                'Hostgroup Alias'   => 'hostgroup_alias'
+            ]);
+        }
+
+        return $this->filterColumns;
+    }
 }
diff -Nru icingaweb2-2.7.1/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php icingaweb2-2.7.3/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
--- icingaweb2-2.7.1/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php	2019-10-18 05:39:24.000000000 +0000
@@ -52,10 +52,24 @@
         return array(
             'instance_name',
             'services_severity',
-            'host', 'host_alias', 'host_contact', 'host_contactgroup', 'host_display_name', 'host_name',
-            'hostgroup', 'hostgroup_alias', 'hostgroup_name',
-            'service', 'service_contact', 'service_contactgroup', 'service_description', 'service_display_name',
+            'host_contact', 'host_contactgroup', 'host_name',
+            'hostgroup_name',
+            'service_contact', 'service_contactgroup', 'service_description',
             'servicegroup'
         );
     }
+
+    public function getFilterColumns()
+    {
+        if ($this->filterColumns === null) {
+            $filterColumns = parent::getFilterColumns();
+            $diff = array_diff($filterColumns, $this->getColumns());
+            $this->filterColumns = array_merge($diff, [
+                'Servicegroup Name'    => 'servicegroup_name',
+                'Servicegroup Alias'   => 'servicegroup_alias'
+            ]);
+        }
+
+        return $this->filterColumns;
+    }
 }
diff -Nru icingaweb2-2.7.1/modules/monitoring/library/Monitoring/Timeline/TimeLine.php icingaweb2-2.7.3/modules/monitoring/library/Monitoring/Timeline/TimeLine.php
--- icingaweb2-2.7.1/modules/monitoring/library/Monitoring/Timeline/TimeLine.php	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/modules/monitoring/library/Monitoring/Timeline/TimeLine.php	2019-10-18 05:39:24.000000000 +0000
@@ -208,6 +208,10 @@
     {
         $groupInfo = array();
         foreach ($this->identifiers as $name => $attributes) {
+            if (isset($attributes['groupBy'])) {
+                $name = $attributes['groupBy'];
+            }
+
             $groupInfo[$name]['class'] = $attributes['class'];
             $groupInfo[$name]['label'] = $attributes['label'];
         }
@@ -436,16 +440,28 @@
             foreach ($data as $timestamp => $count) {
                 $dateTime = new DateTime();
                 $dateTime->setTimestamp($timestamp);
-                $groups[$timestamp][$name] = TimeEntry::fromArray(
-                    array_merge(
-                        $this->identifiers[$name],
+
+                $groupName = $name;
+                if (isset($this->identifiers[$name]['groupBy'])) {
+                    $groupName = $this->identifiers[$name]['groupBy'];
+                }
+
+                if (isset($groups[$timestamp][$groupName])) {
+                    $groups[$timestamp][$groupName]->setValue(
+                        $groups[$timestamp][$groupName]->getValue() + $count
+                    );
+                } else {
+                    $groups[$timestamp][$groupName] = TimeEntry::fromArray(
                         array(
-                            'name'      => $name,
+                            'name'      => $groupName,
                             'value'     => $count,
-                            'dateTime'  => $dateTime
+                            'dateTime'  => $dateTime,
+                            'class'     => $this->identifiers[$name]['class'],
+                            'detailUrl' => $this->identifiers[$name]['detailUrl'],
+                            'label'     => $this->identifiers[$name]['label']
                         )
-                    )
-                );
+                    );
+                }
             }
         }
 
diff -Nru icingaweb2-2.7.1/modules/monitoring/library/Monitoring/Web/Helper/PluginOutputPurifier.php icingaweb2-2.7.3/modules/monitoring/library/Monitoring/Web/Helper/PluginOutputPurifier.php
--- icingaweb2-2.7.1/modules/monitoring/library/Monitoring/Web/Helper/PluginOutputPurifier.php	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/modules/monitoring/library/Monitoring/Web/Helper/PluginOutputPurifier.php	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2018 Icinga Development Team | GPLv2+ */
-
-namespace Icinga\Module\Monitoring\Web\Helper;
-
-use Icinga\Web\Helper\HtmlPurifier;
-
-class PluginOutputPurifier extends HtmlPurifier
-{
-    protected function configure($config)
-    {
-        $config->set(
-            'HTML.Allowed',
-            'p,br,b,a[href|target],i,ul,ol,li,table,tr,th[colspan],td[colspan],div,span,*[class|style]'
-        );
-    }
-}
diff -Nru icingaweb2-2.7.1/modules/monitoring/module.info icingaweb2-2.7.3/modules/monitoring/module.info
--- icingaweb2-2.7.1/modules/monitoring/module.info	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/modules/monitoring/module.info	2019-10-18 05:39:24.000000000 +0000
@@ -1,5 +1,5 @@
 Module: monitoring
-Version: 2.7.1
+Version: 2.7.3
 Description: Icinga monitoring module
  This is the core module for most Icingaweb users. It provides an
  abstraction layer for various Icinga data backends.
diff -Nru icingaweb2-2.7.1/modules/monitoring/public/css/module.less icingaweb2-2.7.3/modules/monitoring/public/css/module.less
--- icingaweb2-2.7.1/modules/monitoring/public/css/module.less	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/modules/monitoring/public/css/module.less	2019-10-18 05:39:24.000000000 +0000
@@ -503,21 +503,38 @@
     }
 
     div.circle-box {
+      // width: inline-style;
       height: 100%;
       margin-right: 0.5em;
       position: relative;
       float: left;
 
       div.outer-circle {
+        // width: inline-style;
+        // height: inline-style;
         position: absolute;
         top: 50%;
+        // margin-top: inline-style;
+
+        &.extrapolated {
+          border-width: 2px;
+          border-style: dotted;
+          //border-color: inline-style;
+          border-radius: 100%;
+          // background-color: inline-style;
+        }
 
         a.inner-circle {
+          // width: inline-style;
+          // height: inline-style;
           display: block;
           position: absolute;
           top: 50%;
           left: 50%;
+          // margin-top: inline-style;
+          // margin-left: inline-style;
           border-radius: 100%;
+          // background-color: inline-style;
         }
       }
     }
@@ -602,15 +619,49 @@
     text-align: left;
     margin-right: 0;
     width: @name-value-table-name-width;
+    color: @gray;
 
     label {
       font-size: inherit;
     }
   }
 
+  .control-group {
+    margin-top: 0;
+    margin-bottom: 0;
+
+    &.indeterminate {
+      justify-content: flex-start;
+
+      .control-label-group {
+        flex: 0 1 auto;
+      }
+
+      select {
+        width: auto;
+        flex: 0 1 auto;
+
+        & + span.hint {
+          flex: 0 1 auto;
+        }
+      }
+    }
+  }
+
   .toggle-switch {
     margin-left: @table-column-padding;
   }
+
+  select {
+    margin-right: .5em;
+    margin-left: @table-column-padding;
+
+    & + span.hint {
+      margin: .35em;
+      color: @gray-light;
+      font-style: italic;
+    }
+  }
 }
 
 .plugin-output {
diff -Nru icingaweb2-2.7.1/modules/setup/module.info icingaweb2-2.7.3/modules/setup/module.info
--- icingaweb2-2.7.1/modules/setup/module.info	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/modules/setup/module.info	2019-10-18 05:39:24.000000000 +0000
@@ -1,5 +1,5 @@
 Module: setup
-Version: 2.7.1
+Version: 2.7.3
 Description: Setup module
  Web based wizard for setting up Icinga Web 2 and its modules.
  This includes the data backends (e.g. relational database, LDAP),
diff -Nru icingaweb2-2.7.1/modules/test/module.info icingaweb2-2.7.3/modules/test/module.info
--- icingaweb2-2.7.1/modules/test/module.info	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/modules/test/module.info	2019-10-18 05:39:24.000000000 +0000
@@ -1,5 +1,5 @@
 Module: test
-Version: 2.7.1
+Version: 2.7.3
 Description: Translation module
  This module allows developers to run (unit) tests against Icinga Web 2 and
  any of its modules. Usually you do not need to enable this.
diff -Nru icingaweb2-2.7.1/modules/translation/module.info icingaweb2-2.7.3/modules/translation/module.info
--- icingaweb2-2.7.1/modules/translation/module.info	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/modules/translation/module.info	2019-10-18 05:39:24.000000000 +0000
@@ -1,5 +1,5 @@
 Module: translation
-Version: 2.7.1
+Version: 2.7.3
 Description: Translation module
  This module allows developers and translators to translate Icinga Web 2 and
  its modules for multiple languages. You do not need this module to run an
diff -Nru icingaweb2-2.7.1/public/css/icinga/controls.less icingaweb2-2.7.3/public/css/icinga/controls.less
--- icingaweb2-2.7.1/public/css/icinga/controls.less	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/public/css/icinga/controls.less	2019-10-18 05:39:24.000000000 +0000
@@ -79,6 +79,10 @@
   }
 }
 
+.controls .button-link {
+  height: 2em;
+}
+
 .limiter-control > select {
   margin-left: .5em;
 }
diff -Nru icingaweb2-2.7.1/public/css/icinga/forms.less icingaweb2-2.7.3/public/css/icinga/forms.less
--- icingaweb2-2.7.1/public/css/icinga/forms.less	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/public/css/icinga/forms.less	2019-10-18 05:39:24.000000000 +0000
@@ -48,7 +48,9 @@
 #layout.minimal-layout,
 #layout.twocols:not(.wide-layout) {
   form.icinga-form {
-    width: 100%;
+    &:not(.inline) {
+      width: 100%;
+    }
 
     .control-label-group {
       text-align: left;
@@ -155,7 +157,7 @@
 }
 
 .icinga-controls {
-  input:not([type="checkbox"]),
+  input:not([type="checkbox"]):not([type="radio"]),
   .toggle-switch,
   button,
   select,
@@ -164,6 +166,10 @@
     .rounded-corners(.25em);
     .appearance(none);
   }
+
+  input[type="radio"] {
+    margin-right: .25em;
+  }
 }
 
 .icinga-controls {
@@ -293,11 +299,7 @@
 
 // Hide default checkbox
 .icinga-controls input[type="checkbox"] {
-  opacity: 0;
-  width: 0;
-  height: 0;
-  margin: 0;
-  padding: 0;
+  display: none;
 }
 
 .icinga-controls .toggle-switch .toggle-slider {
diff -Nru icingaweb2-2.7.1/public/css/icinga/layout-structure.less icingaweb2-2.7.3/public/css/icinga/layout-structure.less
--- icingaweb2-2.7.1/public/css/icinga/layout-structure.less	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/public/css/icinga/layout-structure.less	2019-10-18 05:39:24.000000000 +0000
@@ -10,6 +10,8 @@
   position: fixed;
   left: 0;
   top: 0;
+  // Prevent nav-level-2 flyovers from being covered by #main
+  z-index: 0;
 }
 
 #header {
diff -Nru icingaweb2-2.7.1/public/css/icinga/main.less icingaweb2-2.7.3/public/css/icinga/main.less
--- icingaweb2-2.7.1/public/css/icinga/main.less	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/public/css/icinga/main.less	2019-10-18 05:39:24.000000000 +0000
@@ -78,12 +78,12 @@
   .action-link();
   .rounded-corners(3px);
 
-  background: @gray-lighter;
+  background: @low-sat-blue;
   display: inline-block;
   padding: 0.25em 0.5em;
 
   &:hover {
-    background: @gray-lightest;
+    background: @low-sat-blue-dark;
     text-decoration: none;
   }
 }
diff -Nru icingaweb2-2.7.1/public/css/icinga/menu.less icingaweb2-2.7.3/public/css/icinga/menu.less
--- icingaweb2-2.7.1/public/css/icinga/menu.less	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/public/css/icinga/menu.less	2019-10-18 05:39:24.000000000 +0000
@@ -46,6 +46,10 @@
       text-decoration: none;
     }
   }
+
+  .nav-level-2 {
+    z-index: 1;
+  }
 }
 
 #layout:not(.sidebar-collapsed) #menu .nav-item > a {
diff -Nru icingaweb2-2.7.1/VERSION icingaweb2-2.7.3/VERSION
--- icingaweb2-2.7.1/VERSION	2019-08-14 11:10:19.000000000 +0000
+++ icingaweb2-2.7.3/VERSION	2019-10-18 05:39:24.000000000 +0000
@@ -1 +1 @@
-v2.7.1
+v2.7.3