diff --git a/config/install/monitoring.sensor_config.user_failed_logins.yml b/config/install/monitoring.sensor_config.user_failed_logins.yml
index 1122e17..0a438f9 100644
--- a/config/install/monitoring.sensor_config.user_failed_logins.yml
+++ b/config/install/monitoring.sensor_config.user_failed_logins.yml
@@ -18,9 +18,9 @@ settings:
       value: 'Login attempt failed for %user.'
   verbose_fields:
     - 'wid'
+    - 'message'
     - 'variables'
     - 'timestamp'
-    - 'message'
   time_interval_field: 'timestamp'
   time_interval_value: 86400
 thresholds:
diff --git a/config/install/monitoring.sensor_config.user_sessions_logouts.yml b/config/install/monitoring.sensor_config.user_sessions_logouts.yml
index 551b128..e7004fd 100644
--- a/config/install/monitoring.sensor_config.user_sessions_logouts.yml
+++ b/config/install/monitoring.sensor_config.user_sessions_logouts.yml
@@ -17,8 +17,9 @@ settings:
       field: 'message'
       value: 'Session closed for %name.'
   verbose_fields:
-    - 'message'
     - 'wid'
+    - 'message'
     - 'variables'
+    - 'timestamp'
   time_interval_field: 'timestamp'
   time_interval_value: 86400
diff --git a/config/install/monitoring.sensor_config.user_successful_logins.yml b/config/install/monitoring.sensor_config.user_successful_logins.yml
index 3d623e8..42137c7 100644
--- a/config/install/monitoring.sensor_config.user_successful_logins.yml
+++ b/config/install/monitoring.sensor_config.user_successful_logins.yml
@@ -20,5 +20,6 @@ settings:
     - 'wid'
     - 'message'
     - 'variables'
+    - 'timestamp'
   time_interval_field: 'timestamp'
   time_interval_value: 86400
diff --git a/config/optional/monitoring.sensor_config.dblog_event_severity_alert.yml b/config/optional/monitoring.sensor_config.dblog_event_severity_alert.yml
index 0071c59..dc22863 100644
--- a/config/optional/monitoring.sensor_config.dblog_event_severity_alert.yml
+++ b/config/optional/monitoring.sensor_config.dblog_event_severity_alert.yml
@@ -22,6 +22,7 @@ settings:
     - 'wid'
     - 'message'
     - 'variables'
+    - 'timestamp'
   time_interval_field: timestamp
   time_interval_value: 86400
 thresholds:
diff --git a/config/optional/monitoring.sensor_config.dblog_event_severity_critical.yml b/config/optional/monitoring.sensor_config.dblog_event_severity_critical.yml
index da4013c..750b185 100644
--- a/config/optional/monitoring.sensor_config.dblog_event_severity_critical.yml
+++ b/config/optional/monitoring.sensor_config.dblog_event_severity_critical.yml
@@ -22,6 +22,7 @@ settings:
     - 'wid'
     - 'message'
     - 'variables'
+    - 'timestamp'
   time_interval_field: timestamp
   time_interval_value: 86400
 thresholds:
diff --git a/config/optional/monitoring.sensor_config.dblog_event_severity_debug.yml b/config/optional/monitoring.sensor_config.dblog_event_severity_debug.yml
index c5c3eee..16cea21 100644
--- a/config/optional/monitoring.sensor_config.dblog_event_severity_debug.yml
+++ b/config/optional/monitoring.sensor_config.dblog_event_severity_debug.yml
@@ -22,6 +22,7 @@ settings:
     - 'wid'
     - 'message'
     - 'variables'
+    - 'timestamp'
   time_interval_field: timestamp
   time_interval_value: 86400
 thresholds:
diff --git a/config/optional/monitoring.sensor_config.dblog_event_severity_emergency.yml b/config/optional/monitoring.sensor_config.dblog_event_severity_emergency.yml
index b6b91cd..e0cb852 100644
--- a/config/optional/monitoring.sensor_config.dblog_event_severity_emergency.yml
+++ b/config/optional/monitoring.sensor_config.dblog_event_severity_emergency.yml
@@ -22,6 +22,7 @@ settings:
     - 'wid'
     - 'message'
     - 'variables'
+    - 'timestamp'
   time_interval_field: timestamp
   time_interval_value: 86400
 thresholds:
diff --git a/config/optional/monitoring.sensor_config.dblog_event_severity_error.yml b/config/optional/monitoring.sensor_config.dblog_event_severity_error.yml
index 99f6d81..996dfb6 100644
--- a/config/optional/monitoring.sensor_config.dblog_event_severity_error.yml
+++ b/config/optional/monitoring.sensor_config.dblog_event_severity_error.yml
@@ -22,6 +22,7 @@ settings:
     - 'wid'
     - 'message'
     - 'variables'
+    - 'timestamp'
   time_interval_field: timestamp
   time_interval_value: 86400
 thresholds:
diff --git a/config/optional/monitoring.sensor_config.dblog_event_severity_info.yml b/config/optional/monitoring.sensor_config.dblog_event_severity_info.yml
index b97cd64..16e310d 100644
--- a/config/optional/monitoring.sensor_config.dblog_event_severity_info.yml
+++ b/config/optional/monitoring.sensor_config.dblog_event_severity_info.yml
@@ -22,6 +22,7 @@ settings:
     - 'wid'
     - 'message'
     - 'variables'
+    - 'timestamp'
   time_interval_field: timestamp
   time_interval_value: 86400
 thresholds:
diff --git a/config/optional/monitoring.sensor_config.dblog_event_severity_notice.yml b/config/optional/monitoring.sensor_config.dblog_event_severity_notice.yml
index e8f7725..ae79227 100644
--- a/config/optional/monitoring.sensor_config.dblog_event_severity_notice.yml
+++ b/config/optional/monitoring.sensor_config.dblog_event_severity_notice.yml
@@ -22,6 +22,7 @@ settings:
     - 'wid'
     - 'message'
     - 'variables'
+    - 'timestamp'
   time_interval_field: timestamp
   time_interval_value: 86400
 thresholds:
diff --git a/config/optional/monitoring.sensor_config.dblog_event_severity_warning.yml b/config/optional/monitoring.sensor_config.dblog_event_severity_warning.yml
index 7b7fd38..9935569 100644
--- a/config/optional/monitoring.sensor_config.dblog_event_severity_warning.yml
+++ b/config/optional/monitoring.sensor_config.dblog_event_severity_warning.yml
@@ -22,6 +22,7 @@ settings:
     - 'wid'
     - 'message'
     - 'variables'
+    - 'timestamp'
   time_interval_field: timestamp
   time_interval_value: 86400
 thresholds:
diff --git a/src/Plugin/monitoring/SensorPlugin/WatchdogAggregatorSensorPlugin.php b/src/Plugin/monitoring/SensorPlugin/WatchdogAggregatorSensorPlugin.php
index 174188d..e9c0e8b 100644
--- a/src/Plugin/monitoring/SensorPlugin/WatchdogAggregatorSensorPlugin.php
+++ b/src/Plugin/monitoring/SensorPlugin/WatchdogAggregatorSensorPlugin.php
@@ -42,14 +42,18 @@ class WatchdogAggregatorSensorPlugin extends DatabaseAggregatorSensorPlugin impl
       unset($output['result']['#header']['variables']);
       // Replace the message for every row.
       foreach ($output['result']['#rows'] as $delta => $row) {
-        $output['result']['#rows'][$delta]['message'] = SafeMarkup::format($row['message'], unserialize($row['variables']));
+        // Link the watchdog id to the dblog.
         $output['result']['#rows'][$delta]['wid'] = \Drupal::l($row['wid'], Url::fromUserInput('/admin/reports/dblog/event/' . $row['wid']));
-        if (isset($row['timestamp'])) {
-          $output['result']['#rows'][$delta]['timestamp'] = date("Y-m-d H:i:s", $row['timestamp']);
-        }
 
+        // Replace variables in message.
+        $output['result']['#rows'][$delta]['message'] = SafeMarkup::format($row['message'], unserialize($row['variables']));
         // Do not render the raw message & variables in the row.
         unset($output['result']['#rows'][$delta]['variables']);
+
+        // Reformat the timestamp.
+        if (isset($row['timestamp'])) {
+          $output['result']['#rows'][$delta]['timestamp'] = date("Y-m-d H:i:s", $row['timestamp']);
+        }
       };
     }
   }