diff --git a/query-monitor/assets/query-monitor.css b/query-monitor/assets/query-monitor.css
index 91b4356f42..a83e4858c0 100644
--- a/query-monitor/assets/query-monitor.css
+++ b/query-monitor/assets/query-monitor.css
@@ -167,7 +167,6 @@
 #wpadminbar .qm-alert {
   background-color: #f60;
 }
-#wpadminbar #wp-admin-bar-query-monitor-doing_it_wrong a,
 #wpadminbar #wp-admin-bar-query-monitor-stricts a,
 #wpadminbar #wp-admin-bar-query-monitor-deprecateds a,
 #wpadminbar #wp-admin-bar-query-monitor-notices a,
@@ -176,9 +175,7 @@
 #wpadminbar .qm-notice {
   background-color: #740;
 }
-#wpadminbar #wp-admin-bar-query-monitor-doing_it_wrong a:focus, #wpadminbar #wp-admin-bar-query-monitor-doing_it_wrong a:hover,
-#wpadminbar #wp-admin-bar-query-monitor-stricts a:focus,
-#wpadminbar #wp-admin-bar-query-monitor-stricts a:hover,
+#wpadminbar #wp-admin-bar-query-monitor-stricts a:focus, #wpadminbar #wp-admin-bar-query-monitor-stricts a:hover,
 #wpadminbar #wp-admin-bar-query-monitor-deprecateds a:focus,
 #wpadminbar #wp-admin-bar-query-monitor-deprecateds a:hover,
 #wpadminbar #wp-admin-bar-query-monitor-notices a:focus,
@@ -244,7 +241,6 @@ body.admin-color-light #wp-admin-bar-query-monitor:not(.qm-all-clear):not(:hover
 #wp-admin-bar-query-monitor-default .qm-alert a,
 #wp-admin-bar-query-monitor-default .qm-error a,
 #wp-admin-bar-query-monitor-default .qm-warning a,
-#wp-admin-bar-query-monitor-doing_it_wrong a,
 #wp-admin-bar-query-monitor-deprecateds a,
 #wp-admin-bar-query-monitor-stricts a,
 #wp-admin-bar-query-monitor-notices a,
@@ -442,8 +438,8 @@ body.admin-color-light #wp-admin-bar-query-monitor:not(.qm-all-clear):not(:hover
   height: 27px;
 }
 #query-monitor-main.qm-show {
-  height: 60%;
-  width: 60%;
+  height: 40%;
+  width: 40%;
 }
 #query-monitor-main:not(.qm-show-right) {
   width: 100% !important;
@@ -606,7 +602,7 @@ body.admin-color-light #wp-admin-bar-query-monitor:not(.qm-all-clear):not(:hover
   color: var(--qm-panel-menu-fg) !important;
   cursor: pointer !important;
   display: block !important;
-  padding: 7px 32px 7px 10px !important;
+  padding: 6px 32px 6px 10px !important;
   position: relative !important;
   text-decoration: none !important;
   width: 100% !important;
@@ -733,7 +729,7 @@ body.admin-color-light #wp-admin-bar-query-monitor:not(.qm-all-clear):not(:hover
 #query-monitor-main .qm tfoot th,
 #query-monitor-main .qm tfoot td {
   border: 1px solid var(--qm-cell-border) !important;
-  padding: 6px 6px 5px 6px !important;
+  padding: 5px 5px 4px 5px !important;
   vertical-align: top !important;
 }
 #query-monitor-main .qm tbody th,
@@ -746,7 +742,7 @@ body.admin-color-light #wp-admin-bar-query-monitor:not(.qm-all-clear):not(:hover
   border: 1px solid var(--qm-cell-border) !important;
   border-top: none !important;
   box-shadow: 0 1px 0 var(--qm-cell-border) !important;
-  padding: 5px 5px 5px 6px !important;
+  padding: 5px !important;
   position: -webkit-sticky !important;
   position: sticky !important;
   top: 0 !important;
@@ -789,7 +785,7 @@ body.admin-color-light #wp-admin-bar-query-monitor:not(.qm-all-clear):not(:hover
 #query-monitor-main .qm td.qm-num {
   font-family: Menlo, Monaco, Consolas, monospace !important;
   font-size: 11px !important;
-  line-height: 20px !important;
+  line-height: 19px !important;
 }
 #query-monitor-main .qm td.qm-row-sql {
   min-width: 25em !important;
@@ -809,7 +805,7 @@ body.admin-color-light #wp-admin-bar-query-monitor:not(.qm-all-clear):not(:hover
   min-width: 15em !important;
 }
 #query-monitor-main .qm td.qm-has-toggle {
-  padding-right: 28px !important;
+  padding-right: 24px !important;
   position: relative !important;
 }
 #query-monitor-main .qm td.qm-has-toggle:not(.qm-toggled-on) .qm-supplemental {
@@ -901,7 +897,6 @@ body.admin-color-light #wp-admin-bar-query-monitor:not(.qm-all-clear):not(:hover
 #query-monitor-main .qm li {
   display: list-item !important;
   list-style: none !important;
-  line-height: 20px !important;
 }
 #query-monitor-main .qm li::before {
   content: "" !important;
@@ -910,7 +905,7 @@ body.admin-color-light #wp-admin-bar-query-monitor:not(.qm-all-clear):not(:hover
 #query-monitor-main .qm pre {
   font-family: Menlo, Monaco, Consolas, monospace !important;
   font-size: 11px !important;
-  line-height: 20px !important;
+  line-height: 19px !important;
 }
 #query-monitor-main .qm pre {
   background: transparent !important;
@@ -1264,8 +1259,7 @@ body.admin-color-light #wp-admin-bar-query-monitor:not(.qm-all-clear):not(:hover
 #query-monitor-main .qm-hide-name,
 #query-monitor-main .qm-hide-type,
 #query-monitor-main .qm-hide-caller,
-#query-monitor-main .qm-hide-component,
-#query-monitor-main .qm-hide-host {
+#query-monitor-main .qm-hide-component {
   display: none !important;
 }
 #query-monitor-main .qm thead th.qm-sortable-column {
diff --git a/query-monitor/assets/query-monitor.js b/query-monitor/assets/query-monitor.js
index e02cfefb4a..9aa2aadfd9 100644
--- a/query-monitor/assets/query-monitor.js
+++ b/query-monitor/assets/query-monitor.js
@@ -253,38 +253,20 @@ if ( window.jQuery ) {
 			}
 
 			var matches = tr.filter(':visible');
-			var filtered_count = 0;
-			var total_count = 0;
 			matches.each(function(i){
 				var row_time = $(this).attr('data-qm-time');
 				if ( row_time ) {
 					time += parseFloat( row_time );
 				}
-
-				var row_count = $(this).attr('data-qm-count');
-				if ( row_count ) {
-					filtered_count += parseFloat( row_count );
-				} else {
-					filtered_count++;
-				}
 			});
 			if ( time ) {
 				time = QM_i18n.number_format( time, 4 );
 			}
 
-			tr.each(function(i){
-				var row_count = $(this).attr('data-qm-count');
-				if ( row_count ) {
-					total_count += parseFloat( row_count );
-				} else {
-					total_count++;
-				}
-			});
-
 			if ( table.find('.qm-filtered').length ) {
-				var count = filtered_count + ' / ' + total_count;
+				var count = matches.length + ' / ' + tr.length;
 			} else {
-				var count = filtered_count;
+				var count = matches.length;
 			}
 
 			table.find('.qm-items-number').text(count);
@@ -328,7 +310,7 @@ if ( window.jQuery ) {
 			var toggle = $(this).closest('td').find('.qm-toggled');
 			if ( currentState === 'true' ) {
 				if ( toggle.length ) {
-					toggle.slideToggle(150,function(){
+					toggle.slideToggle(200,function(){
 						el.closest('td').removeClass('qm-toggled-on');
 						el.text(el.attr('data-on'));
 					});
@@ -339,7 +321,7 @@ if ( window.jQuery ) {
 			} else {
 				el.closest('td').addClass('qm-toggled-on');
 				el.text(el.attr('data-off'));
-				toggle.slideToggle(150);
+				toggle.slideToggle(200);
 			}
 			e.preventDefault();
 		});
diff --git a/query-monitor/classes/Activation.php b/query-monitor/classes/Activation.php
index f17b9c27c0..c32d556235 100644
--- a/query-monitor/classes/Activation.php
+++ b/query-monitor/classes/Activation.php
@@ -32,10 +32,6 @@ public function activate( $sitewide = false ) {
 		$db = WP_CONTENT_DIR . '/db.php';
 		$create_symlink = defined( 'QM_DB_SYMLINK' ) ? QM_DB_SYMLINK : true;
 
-		if ( $create_symlink && defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) {
-			$create_symlink = false;
-		}
-
 		if ( $create_symlink && ! file_exists( $db ) && function_exists( 'symlink' ) ) {
 			@symlink( $this->plugin_path( 'wp-content/db.php' ), $db ); // phpcs:ignore
 		}
@@ -49,10 +45,9 @@ public function activate( $sitewide = false ) {
 	}
 
 	/**
-	 * @param bool $network_wide
 	 * @return void
 	 */
-	public function deactivate( $network_wide = false ) {
+	public function deactivate() {
 		$admins = QM_Util::get_admins();
 
 		// Remove legacy capability handling:
@@ -60,8 +55,8 @@ public function deactivate( $network_wide = false ) {
 			$admins->remove_cap( 'view_query_monitor' );
 		}
 
-		# Only delete db.php if a single site and db.php belongs to Query Monitor
-		if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && class_exists( 'QM_DB', false ) && ( $network_wide || ! is_multisite() ) ) {
+		# Only delete db.php if it belongs to Query Monitor
+		if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && class_exists( 'QM_DB', false ) ) {
 			unlink( WP_CONTENT_DIR . '/db.php' ); // phpcs:ignore
 		}
 
diff --git a/query-monitor/classes/Backtrace.php b/query-monitor/classes/Backtrace.php
index d4caf1de2f..9ec8d5ea3c 100644
--- a/query-monitor/classes/Backtrace.php
+++ b/query-monitor/classes/Backtrace.php
@@ -26,11 +26,10 @@ class QM_Backtrace {
 		'Altis\Cloud\DB' => true,
 		'Yoast\WP\Lib\ORM' => true,
 		'Perflab_SQLite_DB' => true,
-		'WP_SQLite_DB' => true,
 	);
 
 	/**
-	 * @var array<string, array<string, bool>>
+	 * @var array<string, bool>
 	 */
 	protected static $ignore_method = array();
 
@@ -47,12 +46,9 @@ class QM_Backtrace {
 		'trigger_error' => true,
 		'_doing_it_wrong' => true,
 		'_deprecated_argument' => true,
-		'_deprecated_constructor' => true,
 		'_deprecated_file' => true,
 		'_deprecated_function' => true,
-		'_deprecated_hook' => true,
 		'dbDelta' => true,
-		'maybe_create_table' => true,
 	);
 
 	/**
@@ -100,9 +96,9 @@ class QM_Backtrace {
 	protected $args = array();
 
 	/**
-	 * @var mixed[]
+	 * @var mixed[]|null
 	 */
-	protected $trace;
+	protected $trace = null;
 
 	/**
 	 * @var mixed[]|null
@@ -225,10 +221,7 @@ public function get_component() {
 			}
 		}
 
-		$file_dirs = QM_Util::get_file_dirs();
-		$file_dirs['dropin'] = WP_CONTENT_DIR;
-
-		foreach ( $file_dirs as $type => $dir ) {
+		foreach ( QM_Util::get_file_dirs() as $type => $dir ) {
 			if ( isset( $components[ $type ] ) ) {
 				$this->component = $components[ $type ];
 				return $this->component;
@@ -411,8 +404,8 @@ public function filter_trace( array $frame ) {
 			 *
 			 * @since 2.7.0
 			 *
-			 * @param array<string, bool> $ignore_class Array of class names to ignore. The array keys are class names to ignore,
-			 *                                          the array values are whether to ignore the class (usually true).
+			 * @param bool[] $ignore_class Array of class names to ignore. The array keys are class names to ignore,
+			 *                             the array values are whether to ignore the class or not (usually true).
 			 */
 			self::$ignore_class = apply_filters( 'qm/trace/ignore_class', self::$ignore_class );
 
@@ -421,9 +414,8 @@ public function filter_trace( array $frame ) {
 			 *
 			 * @since 2.7.0
 			 *
-			 * @param array<string, array<string, bool>> $ignore_method Array of method names to ignore. The top level array keys are
-			 *                                                          class names, the second level array keys are method names, and
-			 *                                                          the array values are whether to ignore the method (usually true).
+			 * @param bool[] $ignore_method Array of method names to ignore. The array keys are method names to ignore,
+			 *                              the array values are whether to ignore the method or not (usually true).
 			 */
 			self::$ignore_method = apply_filters( 'qm/trace/ignore_method', self::$ignore_method );
 
@@ -432,18 +424,18 @@ public function filter_trace( array $frame ) {
 			 *
 			 * @since 2.7.0
 			 *
-			 * @param array<string, bool> $ignore_func Array of function names to ignore. The array keys are function names to ignore,
-			 *                                         the array values are whether to ignore the function (usually true).
+			 * @param bool[] $ignore_func Array of function names to ignore. The array keys are function names to ignore,
+			 *                            the array values are whether to ignore the function or not (usually true).
 			 */
 			self::$ignore_func = apply_filters( 'qm/trace/ignore_func', self::$ignore_func );
 
 			/**
 			 * Filters which action and filter names to ignore when constructing user-facing call stacks.
 			 *
-			 * @since 3.8.0
+			 * @since x.x.x
 			 *
-			 * @param array<string, bool> $ignore_hook Array of hook names to ignore. The array keys are hook names to ignore,
-			 *                                         the array values are whether to ignore the hook (usually true).
+			 * @param bool[] $ignore_hook Array of hook names to ignore. The array keys are hook names to ignore,
+			 *                            the array values are whether to ignore the hook or not (usually true).
 			 */
 			self::$ignore_hook = apply_filters( 'qm/trace/ignore_hook', self::$ignore_hook );
 
@@ -453,9 +445,9 @@ public function filter_trace( array $frame ) {
 			 *
 			 * @since 2.7.0
 			 *
-			 * @param array<string,int|string> $show_args The number of argument values to show for the given function name. The
-			 *                                            array keys are function names, the array values are either integers or
-			 *                                            "dir" to specifically treat the function argument as a directory path.
+			 * @param (int|string)[] $show_args The number of argument values to show for the given function name. The
+			 *                                  array keys are function names, the array values are either integers or
+			 *                                  "dir" to specifically treat the function argument as a directory path.
 			 */
 			self::$show_args = apply_filters( 'qm/trace/show_args', self::$show_args );
 
diff --git a/query-monitor/classes/Collector.php b/query-monitor/classes/Collector.php
index aa14071c7e..2e9ffb9f77 100644
--- a/query-monitor/classes/Collector.php
+++ b/query-monitor/classes/Collector.php
@@ -118,8 +118,6 @@ public static function format_bool_constant( $constant ) {
 		if ( ! defined( $constant ) ) {
 			/* translators: Undefined PHP constant */
 			return __( 'undefined', 'query-monitor' );
-		} elseif ( constant( $constant ) === '' ) {
-			return __( 'empty string', 'query-monitor' );
 		} elseif ( is_string( constant( $constant ) ) && ! is_numeric( constant( $constant ) ) ) {
 			return constant( $constant );
 		} elseif ( ! constant( $constant ) ) {
@@ -175,7 +173,7 @@ final public function process_concerns() {
 		 *
 		 * @since 3.3.0
 		 *
-		 * @param array<int, string> $actions Array of action names that this panel concerns itself with.
+		 * @param string[] $actions Array of action names that this panel concerns itself with.
 		 */
 		$concerned_actions = apply_filters( "qm/collect/concerned_actions/{$id}", $this->get_concerned_actions() );
 
@@ -187,7 +185,7 @@ final public function process_concerns() {
 		 *
 		 * @since 3.3.0
 		 *
-		 * @param array<int, string> $filters Array of filter names that this panel concerns itself with.
+		 * @param string[] $filters Array of filter names that this panel concerns itself with.
 		 */
 		$concerned_filters = apply_filters( "qm/collect/concerned_filters/{$id}", $this->get_concerned_filters() );
 
@@ -199,7 +197,7 @@ final public function process_concerns() {
 		 *
 		 * @since 3.3.0
 		 *
-		 * @param array<int, string> $options Array of option names that this panel concerns itself with.
+		 * @param string[] $options Array of option names that this panel concerns itself with.
 		 */
 		$concerned_options = apply_filters( "qm/collect/concerned_options/{$id}", $this->get_concerned_options() );
 
@@ -211,20 +209,20 @@ final public function process_concerns() {
 		 *
 		 * @since 3.3.0
 		 *
-		 * @param array<int, string> $constants Array of constant names that this panel concerns itself with.
+		 * @param string[] $constants Array of constant names that this panel concerns itself with.
 		 */
 		$concerned_constants = apply_filters( "qm/collect/concerned_constants/{$id}", $this->get_concerned_constants() );
 
 		foreach ( $concerned_actions as $action ) {
 			if ( has_action( $action ) ) {
-				$this->concerned_actions[ $action ] = QM_Hook::process( $action, 'action', $wp_filter, true, false );
+				$this->concerned_actions[ $action ] = QM_Hook::process( $action, $wp_filter, true, false );
 			}
 			$tracked[] = $action;
 		}
 
 		foreach ( $concerned_filters as $filter ) {
 			if ( has_filter( $filter ) ) {
-				$this->concerned_filters[ $filter ] = QM_Hook::process( $filter, 'filter', $wp_filter, true, false );
+				$this->concerned_filters[ $filter ] = QM_Hook::process( $filter, $wp_filter, true, false );
 			}
 			$tracked[] = $filter;
 		}
@@ -246,7 +244,7 @@ final public function process_concerns() {
 					$option
 				);
 				if ( has_filter( $filter ) ) {
-					$this->concerned_filters[ $filter ] = QM_Hook::process( $filter, 'filter', $wp_filter, true, false );
+					$this->concerned_filters[ $filter ] = QM_Hook::process( $filter, $wp_filter, true, false );
 				}
 				$tracked[] = $filter;
 			}
diff --git a/query-monitor/classes/Dispatcher.php b/query-monitor/classes/Dispatcher.php
index b24ce39cf0..02ab0d3dae 100644
--- a/query-monitor/classes/Dispatcher.php
+++ b/query-monitor/classes/Dispatcher.php
@@ -101,7 +101,7 @@ public function cease() {
 	 * Processes and fetches the outputters for this dispatcher.
 	 *
 	 * @param string $outputter_id The outputter ID.
-	 * @return array<string, QM_Output> Array of outputters.
+	 * @return QM_Output[] Array of outputters.
 	 */
 	public function get_outputters( $outputter_id ) {
 		$collectors = QM_Collectors::init();
diff --git a/query-monitor/classes/Hook.php b/query-monitor/classes/Hook.php
index fe3156e854..10d6debd6d 100644
--- a/query-monitor/classes/Hook.php
+++ b/query-monitor/classes/Hook.php
@@ -9,15 +9,12 @@ class QM_Hook {
 
 	/**
 	 * @param string $name
-	 * @param string $type
 	 * @param array<string, WP_Hook> $wp_filter
 	 * @param bool $hide_qm
 	 * @param bool $hide_core
 	 * @return array<int, array<string, mixed>>
-	 * @phpstan-param 'action'|'filter' $type
 	 * @phpstan-return array{
 	 *   name: string,
-	 *   type: 'action'|'filter',
 	 *   actions: list<array{
 	 *     priority: int,
 	 *     callback: array<string, mixed>,
@@ -26,7 +23,7 @@ class QM_Hook {
 	 *   components: array<string, string>,
 	 * }
 	 */
-	public static function process( $name, string $type, array $wp_filter, $hide_qm = false, $hide_core = false ) {
+	public static function process( $name, array $wp_filter, $hide_qm = false, $hide_core = false ) {
 
 		$actions = array();
 		$components = array();
@@ -66,7 +63,6 @@ public static function process( $name, string $type, array $wp_filter, $hide_qm
 
 		return array(
 			'name' => $name,
-			'type' => $type,
 			'actions' => $actions,
 			'parts' => $parts,
 			'components' => $components,
diff --git a/query-monitor/classes/PHP.php b/query-monitor/classes/PHP.php
index 468b2327ab..55f5e060ff 100644
--- a/query-monitor/classes/PHP.php
+++ b/query-monitor/classes/PHP.php
@@ -11,7 +11,7 @@ class QM_PHP {
 	/**
 	 * @var string
 	 */
-	public static $minimum_version = '7.4.0';
+	public static $minimum_version = '7.2.0';
 
 	/**
 	 * @return bool
diff --git a/query-monitor/classes/Plugin.php b/query-monitor/classes/Plugin.php
index c994bf49c2..2a010253a0 100644
--- a/query-monitor/classes/Plugin.php
+++ b/query-monitor/classes/Plugin.php
@@ -54,6 +54,12 @@ final public function plugin_path( $file = '' ) {
 	 * @return string Version
 	 */
 	final public function plugin_ver( $file ) {
+		$path = $this->plugin_path( $file );
+
+		if ( file_exists( $path ) ) {
+			return (string) filemtime( $path );
+		}
+
 		return QM_VERSION;
 	}
 
diff --git a/query-monitor/classes/QM.php b/query-monitor/classes/QM.php
index 095cc2fc40..3d60c324b1 100644
--- a/query-monitor/classes/QM.php
+++ b/query-monitor/classes/QM.php
@@ -143,25 +143,6 @@ public static function debug( $message, array $context = array() ) {
 		do_action( 'qm/debug', $message, $context );
 	}
 
-	/**
-	 * @param mixed $assertion
-	 * @param string $message
-	 * @param ?mixed $value
-	 * @return void
-	 */
-	public static function assert( $assertion, string $message = '', $value = null ) {
-		/**
-		 * Fires when an assertion is performed.
-		 *
-		 * @since x.y.z
-		 *
-		 * @param mixed  $assertion The assertion result, ideally something that evaluates to true.
-		 * @param string $message   The assertion message. May be an empty string.
-		 * @param mixed  $value     Optional. A value to show along with the message when the assertion fails.
-		 */
-		do_action( 'qm/assert', $assertion, $message, $value );
-	}
-
 	/**
 	 * @param string $level
 	 * @param string $message
diff --git a/query-monitor/classes/QueryMonitor.php b/query-monitor/classes/QueryMonitor.php
index b8417ba96d..599107b07f 100644
--- a/query-monitor/classes/QueryMonitor.php
+++ b/query-monitor/classes/QueryMonitor.php
@@ -42,8 +42,7 @@ public function set_up() {
 		 *
 		 * @since 2.14.0
 		 *
-		 * @param array<string, string> $collectors Array of file paths to be loaded, keyed by the base
-		 *                                          name of the file.
+		 * @param string[] $collectors Array of file paths to be loaded.
 		 */
 		foreach ( apply_filters( 'qm/built-in-collectors', $collectors ) as $file ) {
 			include_once $file;
@@ -65,9 +64,9 @@ public function filter_plugin_action_links( array $actions ) {
 	/**
 	 * Filters the array of row meta for each plugin in the Plugins list table.
 	 *
-	 * @param array<int, string> $plugin_meta An array of the plugin's metadata.
-	 * @param string             $plugin_file Path to the plugin file relative to the plugins directory.
-	 * @return array<int, string> Updated array of the plugin's metadata.
+	 * @param string[] $plugin_meta An array of the plugin's metadata.
+	 * @param string   $plugin_file Path to the plugin file relative to the plugins directory.
+	 * @return string[] An array of the plugin's metadata.
 	 */
 	public function filter_plugin_row_meta( array $plugin_meta, $plugin_file ) {
 		if ( 'query-monitor/query-monitor.php' !== $plugin_file ) {
@@ -91,22 +90,18 @@ public function filter_plugin_row_meta( array $plugin_meta, $plugin_file ) {
 	 *
 	 * This does not get called for Super Admins.
 	 *
-	 * @param array<string, bool> $user_caps     Array of key/value pairs where keys represent a capability name and boolean values
-	 *                                           represent whether the user has that capability.
-	 * @param array<int, string>  $required_caps Required primitive capabilities for the requested capability.
-	 * @param mixed[]             $args {
+	 * @param bool[]   $user_caps     Array of key/value pairs where keys represent a capability name and boolean values
+	 *                                represent whether the user has that capability.
+	 * @param string[] $required_caps Required primitive capabilities for the requested capability.
+	 * @param mixed[]  $args {
 	 *     Arguments that accompany the requested capability check.
 	 *
 	 *     @type string    $0 Requested capability.
 	 *     @type int       $1 Concerned user ID.
 	 *     @type mixed  ...$2 Optional second and further parameters.
 	 * }
-	 * @phpstan-param array{
-	 *   0: string,
-	 *   1: int,
-	 * } $args
 	 * @param WP_User  $user          Concerned user object.
-	 * @return array<string, bool> Concerned user's capabilities.
+	 * @return bool[] Concerned user's capabilities.
 	 */
 	public function filter_user_has_cap( array $user_caps, array $required_caps, array $args, WP_User $user ) {
 		if ( 'view_query_monitor' !== $args[0] ) {
@@ -138,8 +133,8 @@ public function action_plugins_loaded() {
 		 *
 		 * @since 2.11.2
 		 *
-		 * @param array<int, QM_Collector> $collectors Array of collector instances.
-		 * @param QueryMonitor             $instance   QueryMonitor instance.
+		 * @param QM_Collector[] $collectors Array of collector instances.
+		 * @param QueryMonitor   $instance   QueryMonitor instance.
 		 */
 		foreach ( apply_filters( 'qm/collectors', array(), $this ) as $collector ) {
 			QM_Collectors::add( $collector );
@@ -155,8 +150,8 @@ public function action_plugins_loaded() {
 		 *
 		 * @since 2.11.2
 		 *
-		 * @param array<int, QM_Dispatcher> $dispatchers Array of dispatcher instances.
-		 * @param QueryMonitor              $instance    QueryMonitor instance.
+		 * @param QM_Dispatcher[] $dispatchers Array of dispatcher instances.
+		 * @param QueryMonitor    $instance    QueryMonitor instance.
 		 */
 		foreach ( apply_filters( 'qm/dispatchers', array(), $this ) as $dispatcher ) {
 			QM_Dispatchers::add( $dispatcher );
diff --git a/query-monitor/classes/Timer.php b/query-monitor/classes/Timer.php
index dd6b6aeca6..5372dbad7a 100644
--- a/query-monitor/classes/Timer.php
+++ b/query-monitor/classes/Timer.php
@@ -8,14 +8,14 @@
 class QM_Timer {
 
 	/**
-	 * @var array<string, mixed>
+	 * @var array<string, mixed>|null
 	 * @phpstan-var array{
 	 *   time: float,
 	 *   memory: int,
 	 *   data: mixed[]|null,
-	 * }
+	 * }|null
 	 */
-	protected $start;
+	protected $start = null;
 
 	/**
 	 * @var array<string, mixed>|null
@@ -28,9 +28,9 @@ class QM_Timer {
 	protected $end = null;
 
 	/**
-	 * @var QM_Backtrace
+	 * @var QM_Backtrace|null
 	 */
-	protected $trace;
+	protected $trace = null;
 
 	/**
 	 * @var array<string, array<string, mixed>>
diff --git a/query-monitor/classes/Util.php b/query-monitor/classes/Util.php
index a36751bbea..b45ee63c5c 100644
--- a/query-monitor/classes/Util.php
+++ b/query-monitor/classes/Util.php
@@ -309,26 +309,6 @@ public static function get_file_component( $file ) {
 				break;
 		}
 
-		if ( 'other' === $type ) {
-			if ( ! function_exists( '_get_dropins' ) ) {
-				require_once trailingslashit( constant( 'ABSPATH' ) ) . 'wp-admin/includes/plugin.php';
-			}
-
-			$dropins = array_keys( _get_dropins() );
-
-			foreach ( $dropins as $dropin ) {
-				$dropin_path = trailingslashit( constant( 'WP_CONTENT_DIR' ) ) . $dropin;
-
-				if ( $file !== $dropin_path ) {
-					continue;
-				}
-
-				$type = 'dropin';
-				/* translators: %s: Drop-in plugin file name */
-				$name = sprintf( __( 'Drop-in: %s', 'query-monitor' ), pathinfo( $dropin, PATHINFO_BASENAME ) );
-			}
-		}
-
 		$component = new QM_Component();
 		$component->type = $type;
 		$component->name = $name;
@@ -650,9 +630,9 @@ public static function json_format( $data ) {
 	public static function get_site_editor_url( string $template, string $type = 'wp_template_part' ): string {
 		return add_query_arg(
 			array(
+				'canvas' => 'view',
 				'postType' => $type,
 				'postId' => urlencode( $template ),
-				'canvas' => 'edit',
 			),
 			admin_url( 'site-editor.php' )
 		);
diff --git a/query-monitor/classes/debug_bar.php b/query-monitor/classes/debug_bar.php
index 0f3baf4731..318274bde9 100644
--- a/query-monitor/classes/debug_bar.php
+++ b/query-monitor/classes/debug_bar.php
@@ -7,7 +7,7 @@
 
 class Debug_Bar {
 	/**
-	 * @var array<int, Debug_Bar_Panel>
+	 * @var Debug_Bar_Panel[]
 	 */
 	public $panels = array();
 
@@ -48,7 +48,7 @@ public function init_panels() {
 		 *
 		 * @since 2.7.0
 		 *
-		 * @param array<int, Debug_Bar_Panel> $panels Array of Debug Bar panel instances.
+		 * @param Debug_Bar_Panel[] $panels Array of Debug Bar panel instances.
 		 */
 		$this->panels = apply_filters( 'debug_bar_panels', array() );
 	}
diff --git a/query-monitor/classes/Collector_Assets.php b/query-monitor/collectors/assets.php
similarity index 93%
rename from query-monitor/classes/Collector_Assets.php
rename to query-monitor/collectors/assets.php
index e6ad9cd669..a49e0ccfdc 100644
--- a/query-monitor/classes/Collector_Assets.php
+++ b/query-monitor/collectors/assets.php
@@ -87,10 +87,9 @@ public function process() {
 		}
 
 		$this->data->is_ssl = is_ssl();
-		$this->data->full_host = wp_unslash( $_SERVER['HTTP_HOST'] );
-		$this->data->host = (string) parse_url( $this->data->full_host, PHP_URL_HOST );
+		$this->data->host = wp_unslash( $_SERVER['HTTP_HOST'] );
 		$this->data->default_version = get_bloginfo( 'version' );
-		$this->data->port = (string) parse_url( $this->data->full_host, PHP_URL_PORT );
+		$this->data->port = (string) parse_url( $this->data->host, PHP_URL_PORT );
 
 		$positions = array(
 			'missing',
@@ -186,7 +185,7 @@ public function process() {
 				if ( $source instanceof WP_Error ) {
 					$display = $source->get_error_message();
 				} else {
-					$display = ltrim( preg_replace( '#https?://' . preg_quote( $this->data->full_host, '#' ) . '#', '', remove_query_arg( 'ver', $source ) ), '/' );
+					$display = ltrim( preg_replace( '#https?://' . preg_quote( $this->data->host, '#' ) . '#', '', remove_query_arg( 'ver', $source ) ), '/' );
 				}
 
 				$dependencies = $dependency->deps;
@@ -287,7 +286,6 @@ public function get_dependency_data( _WP_Dependency $dependency ) {
 		$loader = rtrim( $this->get_dependency_type(), 's' );
 		$src = $dependency->src;
 		$host = '';
-		$full_host = '';
 		$scheme = '';
 		$port = '';
 
@@ -308,17 +306,14 @@ public function get_dependency_data( _WP_Dependency $dependency ) {
 			$host = (string) parse_url( $source, PHP_URL_HOST );
 			$scheme = (string) parse_url( $source, PHP_URL_SCHEME );
 			$port = (string) parse_url( $source, PHP_URL_PORT );
-			$full_host = $host;
-
-			if ( ! empty( $port ) ) {
-				$full_host .= ':' . $port;
-			}
 		}
 
-		if ( empty( $host ) ) {
-			$full_host = $data->full_host;
-			$host = $data->host;
-			$port = $data->port;
+		$http_host = $data->host;
+		$http_port = $data->port;
+
+		if ( empty( $host ) && ! empty( $http_host ) ) {
+			$host = $http_host;
+			$port = $http_port;
 		}
 
 		if ( $scheme && $data->is_ssl && ( 'https' !== $scheme ) && ( 'localhost' !== $host ) ) {
@@ -337,7 +332,7 @@ public function get_dependency_data( _WP_Dependency $dependency ) {
 			$host = '';
 		}
 
-		$local = ( $data->full_host === $full_host );
+		$local = ( $http_host === $host );
 
 		return array( $host, $source, $local, $port );
 	}
diff --git a/query-monitor/collectors/block_editor.php b/query-monitor/collectors/block_editor.php
index 5813f16601..d4a63427f0 100644
--- a/query-monitor/collectors/block_editor.php
+++ b/query-monitor/collectors/block_editor.php
@@ -228,7 +228,7 @@ protected static function wp_has_blocks( $content ) {
 
 	/**
 	 * @param string $content
-	 * @return array<int, mixed>|null
+	 * @return mixed[]|null
 	 */
 	protected static function wp_parse_blocks( $content ) {
 		if ( function_exists( 'parse_blocks' ) ) {
@@ -241,7 +241,7 @@ protected static function wp_parse_blocks( $content ) {
 	}
 
 	/**
-	 * @return array<int, string>|null
+	 * @return string[]|null
 	 */
 	protected static function wp_get_dynamic_block_names() {
 		if ( function_exists( 'get_dynamic_block_names' ) ) {
diff --git a/query-monitor/collectors/cache.php b/query-monitor/collectors/cache.php
index 2461bdfbe1..7800ec274e 100644
--- a/query-monitor/collectors/cache.php
+++ b/query-monitor/collectors/cache.php
@@ -96,7 +96,6 @@ public function process() {
 
 		if ( function_exists( 'extension_loaded' ) ) {
 			$this->data->object_cache_extensions = array_map( 'extension_loaded', array(
-				'Afterburner' => 'afterburner',
 				'APCu' => 'apcu',
 				'Redis' => 'redis',
 				'Relay' => 'relay',
diff --git a/query-monitor/collectors/caps.php b/query-monitor/collectors/caps.php
index da241ee4a1..b1a33aaf8a 100644
--- a/query-monitor/collectors/caps.php
+++ b/query-monitor/collectors/caps.php
@@ -110,20 +110,16 @@ public function get_concerned_constants() {
 	 *
 	 * This does not get called for Super Admins. See filter_map_meta_cap() below.
 	 *
-	 * @param array<string, bool> $user_caps Concerned user's capabilities.
-	 * @param array<int, string>  $caps      Required primitive capabilities for the requested capability.
-	 * @param array<int, mixed>   $args {
+	 * @param bool[]   $user_caps Concerned user's capabilities.
+	 * @param string[] $caps      Required primitive capabilities for the requested capability.
+	 * @param mixed[]  $args {
 	 *     Arguments that accompany the requested capability check.
 	 *
 	 *     @type string    $0 Requested capability.
 	 *     @type int       $1 Concerned user ID.
 	 *     @type mixed  ...$2 Optional second and further parameters.
 	 * }
-	 * @phpstan-param array{
-	 *   0: string,
-	 *   1: int,
-	 * } $args
-	 * @return array<string, bool> Concerned user's capabilities.
+	 * @return bool[] Concerned user's capabilities.
 	 */
 	public function filter_user_has_cap( array $user_caps, array $caps, array $args ) {
 		$trace = new QM_Backtrace( array(
@@ -165,15 +161,15 @@ public function filter_user_has_cap( array $user_caps, array $caps, array $args
 	 *
 	 * This is needed because the `user_has_cap` filter doesn't fire for Super Admins.
 	 *
-	 * @param array<int, string> $required_caps Required primitive capabilities for the requested capability.
-	 * @param string             $cap           Capability or meta capability being checked.
-	 * @param int                $user_id       Concerned user ID.
-	 * @param mixed[]            $args {
+	 * @param string[] $required_caps Required primitive capabilities for the requested capability.
+	 * @param string   $cap           Capability or meta capability being checked.
+	 * @param int      $user_id       Concerned user ID.
+	 * @param mixed[]  $args {
 	 *     Arguments that accompany the requested capability check.
 	 *
 	 *     @type mixed ...$0 Optional second and further parameters.
 	 * }
-	 * @return array<int, string> Required capabilities for the requested action.
+	 * @return string[] Required capabilities for the requested action.
 	 */
 	public function filter_map_meta_cap( array $required_caps, $cap, $user_id, array $args ) {
 		if ( ! is_multisite() ) {
diff --git a/query-monitor/collectors/conditionals.php b/query-monitor/collectors/conditionals.php
index 22d3372b04..1370b40e97 100644
--- a/query-monitor/collectors/conditionals.php
+++ b/query-monitor/collectors/conditionals.php
@@ -30,7 +30,7 @@ public function process() {
 		 *
 		 * @since 2.7.0
 		 *
-		 * @param array<int, string> $conditionals The list of conditional function names.
+		 * @param string[] $conditionals The list of conditional function names.
 		 */
 		$conds = apply_filters( 'qm/collect/conditionals', array(
 			'is_404',
@@ -79,7 +79,7 @@ public function process() {
 		 *
 		 * @since 2.7.0
 		 *
-		 * @param array<int, string> $conditionals The list of conditional function names.
+		 * @param string[] $conditionals The list of conditional function names.
 		 */
 		$conds = apply_filters( 'query_monitor_conditionals', $conds );
 
diff --git a/query-monitor/collectors/db_dupes.php b/query-monitor/collectors/db_dupes.php
index e6733b5038..9d93c2652e 100644
--- a/query-monitor/collectors/db_dupes.php
+++ b/query-monitor/collectors/db_dupes.php
@@ -55,9 +55,9 @@ public function process() {
 			// Loop over each query
 			foreach ( $query_ids as $query_id ) {
 
-				if ( isset( $dbq_data->rows[ $query_id ]['trace'] ) ) {
+				if ( isset( $dbq_data->wpdb->rows[ $query_id ]['trace'] ) ) {
 					/** @var QM_Backtrace */
-					$trace = $dbq_data->rows[ $query_id ]['trace'];
+					$trace = $dbq_data->wpdb->rows[ $query_id ]['trace'];
 					$stack = array_column( $trace->get_filtered_trace(), 'id' );
 					$component = $trace->get_component();
 
@@ -69,7 +69,7 @@ public function process() {
 					}
 				} else {
 					/** @var array<int, string> */
-					$stack = $dbq_data->rows[ $query_id ]['stack'];
+					$stack = $dbq_data->wpdb->rows[ $query_id ]['stack'];
 				}
 
 				// Populate the caller counts for this query
@@ -84,9 +84,9 @@ public function process() {
 
 				// Populate the time for this query
 				if ( isset( $times[ $sql ] ) ) {
-					$times[ $sql ] += $dbq->data->rows[ $query_id ]['ltime'];
+					$times[ $sql ] += $dbq->data->wpdb->rows[ $query_id ]['ltime'];
 				} else {
-					$times[ $sql ] = $dbq->data->rows[ $query_id ]['ltime'];
+					$times[ $sql ] = $dbq->data->wpdb->rows[ $query_id ]['ltime'];
 				}
 			}
 
diff --git a/query-monitor/collectors/db_queries.php b/query-monitor/collectors/db_queries.php
index 94309e4ba6..7e5ec30e62 100644
--- a/query-monitor/collectors/db_queries.php
+++ b/query-monitor/collectors/db_queries.php
@@ -107,7 +107,7 @@ protected function log_caller( $caller, $ltime, $type ) {
 	 * @return void
 	 */
 	public function process_db_object() {
-		global $wp_the_query, $wpdb;
+		global $EZSQL_ERROR, $wp_the_query, $wpdb;
 
 		$this->wpdb = $wpdb;
 
@@ -117,6 +117,7 @@ public function process_db_object() {
 			return;
 		}
 
+		$rows = array();
 		$types = array();
 		$total_time = 0;
 		$has_result = false;
@@ -142,6 +143,8 @@ public function process_db_object() {
 		 * } $query
 		 */
 		foreach ( $wpdb->queries as $query ) {
+			$has_trace = false;
+			$has_result = false;
 			$callers = array();
 
 			if ( isset( $query['query'], $query['elapsed'], $query['debug'] ) ) {
@@ -197,13 +200,27 @@ public function process_db_object() {
 
 			$this->log_type( $type );
 			$this->log_caller( $caller_name, $ltime, $type );
+
 			$this->maybe_log_dupe( $sql, $i );
 
 			if ( $component ) {
 				$this->log_component( $component, $ltime, $type );
 			}
 
+			if ( ! isset( $types[ $type ]['total'] ) ) {
+				$types[ $type ]['total'] = 1;
+			} else {
+				$types[ $type ]['total']++;
+			}
+
+			if ( ! isset( $types[ $type ]['callers'][ $caller ] ) ) {
+				$types[ $type ]['callers'][ $caller ] = 1;
+			} else {
+				$types[ $type ]['callers'][ $caller ]++;
+			}
+
 			$is_main_query = ( $request === $sql && ( false !== strpos( $stack, ' WP->main,' ) ) );
+
 			$row = compact( 'caller', 'caller_name', 'sql', 'ltime', 'result', 'type', 'component', 'trace', 'is_main_query' );
 
 			if ( ! isset( $trace ) ) {
@@ -220,19 +237,43 @@ public function process_db_object() {
 				$this->data->expensive[] = $row;
 			}
 
-			$this->data->rows[ $i ] = $row;
+			$rows[ $i ] = $row;
 			$i++;
+
+		}
+
+		if ( ! $has_result && ! empty( $EZSQL_ERROR ) && is_array( $EZSQL_ERROR ) ) {
+			// Fallback for displaying database errors when wp-content/db.php isn't in place
+			foreach ( $EZSQL_ERROR as $error ) {
+				$row = array(
+					'caller' => null,
+					'caller_name' => null,
+					'stack' => array(),
+					'sql' => $error['query'],
+					'ltime' => 0,
+					'result' => new WP_Error( 'qmdb', $error['error_str'] ),
+					'type' => '',
+					'component' => false,
+					'trace' => null,
+					'is_main_query' => false,
+				);
+				$this->data->errors[] = $row;
+			}
 		}
 
-		$has_main_query = wp_list_filter( $this->data->rows, array(
+		$total_qs = count( $rows );
+
+		$this->data->total_qs   += $total_qs;
+		$this->data->total_time += $total_time;
+
+		$has_main_query = wp_list_filter( $rows, array(
 			'is_main_query' => true,
 		) );
 
-		$this->data->total_qs = count( $this->data->rows );
-		$this->data->total_time = $total_time;
-		$this->data->has_result = $has_result;
-		$this->data->has_trace = $has_trace;
-		$this->data->has_main_query = ! empty( $has_main_query );
+		# @TODO put errors in here too:
+		# @TODO proper class instead of (object)
+		$this->data->wpdb = (object) compact( 'rows', 'types', 'has_result', 'has_trace', 'total_time', 'total_qs', 'has_main_query' );
+
 	}
 
 	/**
diff --git a/query-monitor/collectors/debug_bar.php b/query-monitor/collectors/debug_bar.php
index 418cedd607..ccd3abb4b7 100644
--- a/query-monitor/collectors/debug_bar.php
+++ b/query-monitor/collectors/debug_bar.php
@@ -66,9 +66,7 @@ function register_qm_collectors_debug_bar() {
 
 	global $debug_bar;
 
-	$debug_bar_exists = isset( $GLOBALS['debug_bar'] ) && ( $GLOBALS['debug_bar'] instanceof Debug_Bar );
-
-	if ( $debug_bar_exists || qm_debug_bar_being_activated() ) {
+	if ( class_exists( 'Debug_Bar', false ) || qm_debug_bar_being_activated() ) {
 		return;
 	}
 
diff --git a/query-monitor/collectors/doing_it_wrong.php b/query-monitor/collectors/doing_it_wrong.php
deleted file mode 100644
index fb55f230e0..0000000000
--- a/query-monitor/collectors/doing_it_wrong.php
+++ /dev/null
@@ -1,341 +0,0 @@
-<?php declare(strict_types = 1);
-/**
- * Doing it Wrong collector.
- *
- * @package query-monitor
- */
-
-if ( ! defined( 'ABSPATH' ) ) {
-	exit;
-}
-
-/**
- * @extends QM_DataCollector<QM_Data_Doing_It_Wrong>
- */
-class QM_Collector_Doing_It_Wrong extends QM_DataCollector {
-
-	public $id = 'doing_it_wrong';
-
-	public function get_storage(): QM_Data {
-		return new QM_Data_Doing_It_Wrong();
-	}
-
-	/**
-	 * @return void
-	 */
-	public function set_up() {
-		parent::set_up();
-
-		add_action( 'doing_it_wrong_run', array( $this, 'action_doing_it_wrong_run' ), 10, 3 );
-		add_action( 'deprecated_function_run', array( $this, 'action_deprecated_function_run' ), 10, 3 );
-		add_action( 'deprecated_constructor_run', array( $this, 'action_deprecated_constructor_run' ), 10, 3 );
-		add_action( 'deprecated_file_included', array( $this, 'action_deprecated_file_included' ), 10, 4 );
-		add_action( 'deprecated_argument_run', array( $this, 'action_deprecated_argument_run' ), 10, 3 );
-		add_action( 'deprecated_hook_run', array( $this, 'action_deprecated_hook_run' ), 10, 4 );
-
-		add_filter( 'deprecated_function_trigger_error', array( $this, 'maybe_prevent_error' ), 999 );
-		add_filter( 'deprecated_constructor_trigger_error', array( $this, 'maybe_prevent_error' ), 999 );
-		add_filter( 'deprecated_file_trigger_error', array( $this, 'maybe_prevent_error' ), 999 );
-		add_filter( 'deprecated_argument_trigger_error', array( $this, 'maybe_prevent_error' ), 999 );
-		add_filter( 'deprecated_hook_trigger_error', array( $this, 'maybe_prevent_error' ), 999 );
-		add_filter( 'doing_it_wrong_trigger_error', array( $this, 'maybe_prevent_error' ), 999 );
-	}
-
-	/**
-	 * @return void
-	 */
-	public function tear_down() {
-		parent::tear_down();
-
-		remove_action( 'doing_it_wrong_run', array( $this, 'action_doing_it_wrong_run' ) );
-		remove_action( 'deprecated_function_run', array( $this, 'action_deprecated_function_run' ) );
-		remove_action( 'deprecated_constructor_run', array( $this, 'action_deprecated_constructor_run' ) );
-		remove_action( 'deprecated_file_included', array( $this, 'action_deprecated_file_included' ) );
-		remove_action( 'deprecated_argument_run', array( $this, 'action_deprecated_argument_run' ) );
-		remove_action( 'deprecated_hook_run', array( $this, 'action_deprecated_hook_run' ) );
-
-		remove_filter( 'deprecated_function_trigger_error', array( $this, 'maybe_prevent_error' ) );
-		remove_filter( 'deprecated_constructor_trigger_error', array( $this, 'maybe_prevent_error' ) );
-		remove_filter( 'deprecated_file_trigger_error', array( $this, 'maybe_prevent_error' ) );
-		remove_filter( 'deprecated_argument_trigger_error', array( $this, 'maybe_prevent_error' ) );
-		remove_filter( 'deprecated_hook_trigger_error', array( $this, 'maybe_prevent_error' ) );
-		remove_filter( 'doing_it_wrong_trigger_error', array( $this, 'maybe_prevent_error' ) );
-	}
-
-	/**
-	 * Prevents the PHP error (notice or deprecated) from being triggered for doing it wrong calls when the
-	 * current user can view Query Monitor output.
-	 *
-	 * @param bool $trigger
-	 * @return bool
-	 */
-	public function maybe_prevent_error( $trigger ) {
-		if ( function_exists( 'wp_get_current_user' ) && current_user_can( 'view_query_monitor' ) ) {
-			return false;
-		}
-
-		return $trigger;
-	}
-
-	/**
-	 * @return array<int, string>
-	 */
-	public function get_concerned_actions() {
-		return array(
-			'doing_it_wrong_run',
-			'deprecated_function_run',
-			'deprecated_constructor_run',
-			'deprecated_file_included',
-			'deprecated_argument_run',
-			'deprecated_hook_run',
-		);
-	}
-
-	/**
-	 * @return array<int, string>
-	 */
-	public function get_concerned_filters() {
-		return array(
-			'deprecated_function_trigger_error',
-			'deprecated_constructor_trigger_error',
-			'deprecated_file_trigger_error',
-			'deprecated_argument_trigger_error',
-			'deprecated_hook_trigger_error',
-			'doing_it_wrong_trigger_error',
-		);
-	}
-
-	/**
-	 * @param string $function_name
-	 * @param string $message
-	 * @param string $version
-	 * @return void
-	 */
-	public function action_doing_it_wrong_run( $function_name, $message, $version ) {
-		$trace = new QM_Backtrace( array(
-			'ignore_hook' => array(
-				current_action() => true,
-			),
-		) );
-
-		if ( $version ) {
-			/* translators: %s: Version number. */
-			$version = sprintf( __( '(This message was added in version %s.)', 'query-monitor' ), $version );
-		}
-
-		$this->data->actions[] = array(
-			'hook'           => 'doing_it_wrong_run',
-			'filtered_trace' => $trace->get_filtered_trace(),
-			'component'      => $trace->get_component(),
-			'message'        => sprintf(
-				/* translators: Developer debugging message. 1: PHP function name, 2: Explanatory message, 3: WordPress version number. */
-				__( 'Function %1$s was called incorrectly. %2$s %3$s', 'query-monitor' ),
-				$function_name,
-				$message,
-				$version
-			),
-		);
-	}
-
-	/**
-	 * @param string $function_name
-	 * @param string $replacement
-	 * @param string $version
-	 * @return void
-	 */
-	public function action_deprecated_function_run( $function_name, $replacement, $version ) {
-		$trace = new QM_Backtrace( array(
-			'ignore_hook' => array(
-				current_action() => true,
-			),
-		) );
-
-		$message = sprintf(
-			/* translators: 1: PHP function name, 2: Version number. */
-			__( 'Function %1$s is deprecated since version %2$s with no alternative available.', 'query-monitor' ),
-			$function_name,
-			$version
-		);
-
-		if ( $replacement ) {
-			$message = sprintf(
-				/* translators: 1: PHP function name, 2: Version number, 3: Alternative function name. */
-				__( 'Function %1$s is deprecated since version %2$s! Use %3$s instead.', 'query-monitor' ),
-				$function_name,
-				$version,
-				$replacement
-			);
-		}
-
-		$this->data->actions[] = array(
-			'hook'           => 'deprecated_function_run',
-			'filtered_trace' => $trace->get_filtered_trace(),
-			'component'      => $trace->get_component(),
-			'message'        => $message,
-		);
-	}
-
-	/**
-	 * @param string $class_name
-	 * @param string $version
-	 * @param string $parent_class
-	 * @return void
-	 */
-	public function action_deprecated_constructor_run( $class_name, $version, $parent_class ) {
-		$trace = new QM_Backtrace( array(
-			'ignore_hook' => array(
-				current_action() => true,
-			),
-		) );
-
-		$message = sprintf(
-			/* translators: 1: PHP class name, 2: Version number, 3: __construct() method. */
-			__( 'The called constructor method for %1$s class is deprecated since version %2$s! Use %3$s instead.', 'query-monitor' ),
-			$class_name,
-			$version,
-			'<code>__construct()</code>'
-		);
-
-		if ( $parent_class ) {
-			$message = sprintf(
-				/* translators: 1: PHP class name, 2: PHP parent class name, 3: Version number, 4: __construct() method. */
-				__( 'The called constructor method for %1$s class in %2$s is deprecated since version %3$s! Use %4$s instead.', 'query-monitor' ),
-				$class_name,
-				$parent_class,
-				$version,
-				'<code>__construct()</code>'
-			);
-		}
-
-		$this->data->actions[] = array(
-			'hook'           => 'deprecated_constructor_run',
-			'filtered_trace' => $trace->get_filtered_trace(),
-			'component'      => $trace->get_component(),
-			'message'        => $message,
-		);
-	}
-
-	/**
-	 * @param string $file
-	 * @param string $replacement
-	 * @param string $version
-	 * @param string $message
-	 * @return void
-	 */
-	public function action_deprecated_file_included( $file, $replacement, $version, $message ) {
-		$trace = new QM_Backtrace( array(
-			'ignore_hook' => array(
-				current_action() => true,
-			),
-		) );
-
-		if ( $replacement ) {
-			$message = sprintf(
-				/* translators: 1: PHP file name, 2: Version number, 3: Alternative file name, 4: Optional message regarding the change. */
-				__( 'File %1$s is deprecated since version %2$s! Use %3$s instead. %4$s', 'query-monitor' ),
-				$file,
-				$version,
-				$replacement,
-				$message
-			);
-		} else {
-			$message = sprintf(
-				/* translators: 1: PHP file name, 2: Version number, 3: Optional message regarding the change. */
-				__( 'File %1$s is deprecated since version %2$s with no alternative available. %3$s', 'query-monitor' ),
-				$file,
-				$version,
-				$message
-			);
-		}
-
-		$this->data->actions[] = array(
-			'hook'           => 'deprecated_file_included',
-			'filtered_trace' => $trace->get_filtered_trace(),
-			'component'      => $trace->get_component(),
-			'message'        => $message,
-		);
-	}
-
-	/**
-	 * @param string $function_name
-	 * @param string $message
-	 * @param string $version
-	 * @return void
-	 */
-	public function action_deprecated_argument_run( $function_name, $message, $version ) {
-		$trace = new QM_Backtrace( array(
-			'ignore_hook' => array(
-				current_action() => true,
-			),
-		) );
-
-		if ( $message ) {
-			$message = sprintf(
-				/* translators: 1: PHP function name, 2: Version number, 3: Optional message regarding the change. */
-				__( 'Function %1$s was called with an argument that is deprecated since version %2$s! %3$s', 'query-monitor' ),
-				$function_name,
-				$version,
-				$message
-			);
-		} else {
-			$message = sprintf(
-				/* translators: 1: PHP function name, 2: Version number. */
-				__( 'Function %1$s was called with an argument that is deprecated since version %2$s with no alternative available.', 'query-monitor' ),
-				$function_name,
-				$version
-			);
-		}
-
-		$this->data->actions[] = array(
-			'hook'           => 'deprecated_argument_run',
-			'filtered_trace' => $trace->get_filtered_trace(),
-			'component'      => $trace->get_component(),
-			'message'        => $message,
-		);
-	}
-
-	/**
-	 * @param string $hook
-	 * @param string $replacement
-	 * @param string $version
-	 * @param string $message
-	 * @return void
-	 */
-	public function action_deprecated_hook_run( $hook, $replacement, $version, $message ) {
-		$trace = new QM_Backtrace( array(
-			'ignore_hook' => array(
-				current_action() => true,
-			),
-		) );
-
-		if ( $replacement ) {
-			$message = sprintf(
-				/* translators: 1: WordPress hook name, 2: Version number, 3: Alternative hook name, 4: Optional message regarding the change. */
-				__( 'Hook %1$s is deprecated since version %2$s! Use %3$s instead. %4$s', 'query-monitor' ),
-				$hook,
-				$version,
-				$replacement,
-				$message
-			);
-		} else {
-			$message = sprintf(
-				/* translators: 1: WordPress hook name, 2: Version number, 3: Optional message regarding the change. */
-				__( 'Hook %1$s is deprecated since version %2$s with no alternative available. %3$s', 'query-monitor' ),
-				$hook,
-				$version,
-				$message
-			);
-		}
-
-		$this->data->actions[] = array(
-			'hook'           => 'deprecated_hook_run',
-			'filtered_trace' => $trace->get_filtered_trace(),
-			'component'      => $trace->get_component(),
-			'message'        => $message,
-		);
-	}
-
-}
-
-# Load early to catch early actions
-QM_Collectors::add( new QM_Collector_Doing_It_Wrong() );
diff --git a/query-monitor/collectors/environment.php b/query-monitor/collectors/environment.php
index 4f303cf34e..54690df7e9 100644
--- a/query-monitor/collectors/environment.php
+++ b/query-monitor/collectors/environment.php
@@ -119,8 +119,7 @@ public function process() {
 				$extension = null;
 			}
 
-			// mysqli_get_client_version() may not exist in Wasm environment.
-			$client = function_exists( 'mysqli_get_client_version' ) ? mysqli_get_client_version() : null;
+			$client = mysqli_get_client_version();
 
 			if ( $client ) {
 				$client_version = implode( '.', QM_Util::get_client_version( $client ) );
@@ -143,7 +142,7 @@ public function process() {
 			$this->data->db = array(
 				'info' => $info,
 				'vars' => $mysql_vars,
-				'variables' => is_array( $variables ) ? $variables : array(),
+				'variables' => $variables ?: array(),
 			);
 		}
 
@@ -165,7 +164,7 @@ public function process() {
 		if ( function_exists( 'get_loaded_extensions' ) ) {
 			$extensions = get_loaded_extensions();
 			sort( $extensions, SORT_STRING | SORT_FLAG_CASE );
-			$php_data['extensions'] = array_combine( $extensions, array_map( array( $this, 'get_extension_version' ), $extensions ) ) ?: array();
+			$php_data['extensions'] = array_combine( $extensions, array_map( array( $this, 'get_extension_version' ), $extensions ) );
 		} else {
 			$php_data['extensions'] = array();
 		}
@@ -184,17 +183,12 @@ public function process() {
 			'COMPRESS_SCRIPTS' => self::format_bool_constant( 'COMPRESS_SCRIPTS' ),
 			'COMPRESS_CSS' => self::format_bool_constant( 'COMPRESS_CSS' ),
 			'WP_ENVIRONMENT_TYPE' => self::format_bool_constant( 'WP_ENVIRONMENT_TYPE' ),
-			'WP_DEVELOPMENT_MODE' => self::format_bool_constant( 'WP_DEVELOPMENT_MODE' ),
 		);
 
 		if ( function_exists( 'wp_get_environment_type' ) ) {
 			$this->data->wp['environment_type'] = wp_get_environment_type();
 		}
 
-		if ( function_exists( 'wp_get_development_mode' ) ) {
-			$this->data->wp['development_mode'] = wp_get_development_mode();
-		}
-
 		$this->data->wp['constants'] = apply_filters( 'qm/environment-constants', $constants );
 
 		if ( is_multisite() ) {
diff --git a/query-monitor/collectors/hooks.php b/query-monitor/collectors/hooks.php
index d0771261ed..5bd76f4355 100644
--- a/query-monitor/collectors/hooks.php
+++ b/query-monitor/collectors/hooks.php
@@ -45,8 +45,8 @@ public function process() {
 		$all_parts = array();
 		$components = array();
 
-		if ( has_action( 'all' ) ) {
-			$hooks[] = QM_Hook::process( 'all', 'action', $wp_filter, self::$hide_qm, self::$hide_core );
+		if ( has_filter( 'all' ) ) {
+			$hooks[] = QM_Hook::process( 'all', $wp_filter, self::$hide_qm, self::$hide_core );
 		}
 
 		$this->data->all_hooks = defined( 'QM_SHOW_ALL_HOOKS' ) && QM_SHOW_ALL_HOOKS;
@@ -60,13 +60,8 @@ public function process() {
 		}
 
 		foreach ( $hook_names as $name ) {
-			$type = 'action';
 
-			if ( $this->data->all_hooks ) {
-				$type = array_key_exists( $name, $wp_actions ) ? 'action' : 'filter';
-			}
-
-			$hook = QM_Hook::process( $name, $type, $wp_filter, self::$hide_qm, self::$hide_core );
+			$hook = QM_Hook::process( $name, $wp_filter, self::$hide_qm, self::$hide_core );
 			$hooks[] = $hook;
 
 			$all_parts = array_merge( $all_parts, $hook['parts'] );
diff --git a/query-monitor/collectors/http.php b/query-monitor/collectors/http.php
index 0189a3a6bc..9da8d9ebe2 100644
--- a/query-monitor/collectors/http.php
+++ b/query-monitor/collectors/http.php
@@ -19,6 +19,11 @@ class QM_Collector_HTTP extends QM_DataCollector {
 	 */
 	public $id = 'http';
 
+	/**
+	 * @var string|null
+	 */
+	private $transport = null;
+
 	/**
 	 * @var mixed|null
 	 */
@@ -42,6 +47,7 @@ class QM_Collector_HTTP extends QM_DataCollector {
 	 *   end: float,
 	 *   args: array<string, mixed>,
 	 *   response: mixed[]|WP_Error,
+	 *   transport: string|null,
 	 *   info: array<string, mixed>|null,
 	 * }>
 	 */
@@ -62,7 +68,9 @@ public function set_up() {
 		add_filter( 'pre_http_request', array( $this, 'filter_pre_http_request' ), 9999, 3 );
 		add_action( 'http_api_debug', array( $this, 'action_http_api_debug' ), 9999, 5 );
 
+		add_action( 'requests-curl.before_request', array( $this, 'action_curl_before_request' ), 9999 );
 		add_action( 'requests-curl.after_request', array( $this, 'action_curl_after_request' ), 9999, 2 );
+		add_action( 'requests-fsockopen.before_request', array( $this, 'action_fsockopen_before_request' ), 9999 );
 		add_action( 'requests-fsockopen.after_request', array( $this, 'action_fsockopen_after_request' ), 9999, 2 );
 
 	}
@@ -241,9 +249,15 @@ public function filter_pre_http_request( $response, array $args, $url ) {
 	 * @return void
 	 */
 	public function action_http_api_debug( $response, $action, $class, $args, $url ) {
+		$this->transport = null;
+
 		switch ( $action ) {
 
 			case 'response':
+				if ( ! empty( $class ) ) {
+					$this->transport = str_replace( 'wp_http_', '', strtolower( $class ) );
+				}
+
 				$this->log_http_response( $response, $args, $url );
 
 				break;
@@ -256,6 +270,13 @@ public function action_http_api_debug( $response, $action, $class, $args, $url )
 
 	}
 
+	/**
+	 * @return void
+	 */
+	public function action_curl_before_request() {
+		$this->transport = 'curl';
+	}
+
 	/**
 	 * @param mixed $headers
 	 * @param mixed[] $info
@@ -265,6 +286,13 @@ public function action_curl_after_request( $headers, array $info = null ) {
 		$this->info = $info;
 	}
 
+	/**
+	 * @return void
+	 */
+	public function action_fsockopen_before_request() {
+		$this->transport = 'fsockopen';
+	}
+
 	/**
 	 * @param mixed $headers
 	 * @param mixed[] $info
@@ -291,6 +319,7 @@ public function log_http_response( $response, array $args, $url ) {
 			'response' => $response,
 			'args' => $args,
 			'info' => $this->info,
+			'transport' => $this->transport,
 		);
 
 		if ( isset( $args['_qm_original_key'] ) ) {
@@ -307,6 +336,7 @@ public function log_http_response( $response, array $args, $url ) {
 		$this->http_responses[ $key ] = $http_response;
 
 		$this->info = null;
+		$this->transport = null;
 	}
 
 	/**
@@ -360,7 +390,7 @@ public function process() {
 			$ltime = ( $response['end'] - $request['start'] );
 			$redirected_to = null;
 
-			if ( isset( $response['info'] ) && ! empty( $response['info']['url'] ) && is_string( $response['info']['url'] ) ) {
+			if ( isset( $response['info'] ) && is_string( $response['info']['url'] ) && ! empty( $response['info']['url'] ) ) {
 				// Ignore query variables when detecting a redirect.
 				$from = untrailingslashit( preg_replace( '#\?[^$]+$#', '', $request['url'] ) );
 				$to = untrailingslashit( preg_replace( '#\?[^$]+$#', '', $response['info']['url'] ) );
@@ -380,12 +410,12 @@ public function process() {
 				'args' => $response['args'],
 				'component' => $request['component'],
 				'filtered_trace' => $request['filtered_trace'],
-				'host' => $host,
 				'info' => $response['info'],
 				'local' => $local,
 				'ltime' => $ltime,
 				'redirected_to' => $redirected_to,
 				'response' => $response['response'],
+				'transport' => $response['transport'],
 				'type' => $type,
 				'url' => $request['url'],
 			);
diff --git a/query-monitor/collectors/languages.php b/query-monitor/collectors/languages.php
index 5af9448c54..044762eb10 100644
--- a/query-monitor/collectors/languages.php
+++ b/query-monitor/collectors/languages.php
@@ -93,7 +93,6 @@ public function get_concerned_filters() {
 			'plugin_locale',
 			'pre_determine_locale',
 			'pre_load_script_translations',
-			'pre_load_textdomain',
 			'theme_locale',
 		);
 	}
diff --git a/query-monitor/collectors/logger.php b/query-monitor/collectors/logger.php
index eb8c9f2d98..a3f22d8ce3 100644
--- a/query-monitor/collectors/logger.php
+++ b/query-monitor/collectors/logger.php
@@ -42,7 +42,6 @@ public function set_up() {
 			add_action( "qm/{$level}", array( $this, $level ), 10, 2 );
 		}
 
-		add_action( 'qm/assert', array( $this, 'assert' ), 10, 3 );
 		add_action( 'qm/log', array( $this, 'log' ), 10, 3 );
 	}
 
@@ -139,49 +138,6 @@ public function debug( $message, array $context = array() ) {
 		$this->store( self::DEBUG, $message, $context );
 	}
 
-	/**
-	 * @param mixed $assertion
-	 * @param string $message
-	 * @param ?mixed $value
-	 * @return void
-	 */
-	public function assert( $assertion, string $message = '', $value = null ) {
-		$prefix = null;
-
-		if ( $assertion ) {
-			$level = self::DEBUG;
-
-			if ( $message ) {
-				$message = sprintf(
-					/* translators: %s: Assertion message */
-					__( 'Assertion passed: %s', 'query-monitor' ),
-					$message
-				);
-			} else {
-				$message = __( 'Assertion passed', 'query-monitor' );
-			}
-		} else {
-			$level = self::ERROR;
-
-			if ( $message ) {
-				$message = sprintf(
-					/* translators: %s: Assertion message */
-					__( 'Assertion failed: %s', 'query-monitor' ),
-					$message
-				);
-			} else {
-				$message = __( 'Assertion failed', 'query-monitor' );
-			}
-
-			if ( $value !== null ) {
-				$prefix = $message;
-				$message = $value;
-			}
-		}
-
-		$this->store( $level, $message, array(), $prefix );
-	}
-
 	/**
 	 * @param string $level
 	 * @param mixed $message
@@ -202,12 +158,11 @@ public function log( $level, $message, array $context = array() ) {
 	 * @param string $level
 	 * @param mixed $message
 	 * @param array<string, mixed> $context
-	 * @param ?string $prefix
 	 * @phpstan-param self::* $level
 	 * @phpstan-param LogMessage $message
 	 * @return void
 	 */
-	protected function store( $level, $message, array $context = array(), string $prefix = null ) {
+	protected function store( $level, $message, array $context = array() ) {
 		$trace = new QM_Backtrace( array(
 			'ignore_hook' => array(
 				current_filter() => true,
@@ -246,7 +201,7 @@ protected function store( $level, $message, array $context = array(), string $pr
 
 		$this->data->counts[ $level ]++;
 		$this->data->logs[] = array(
-			'message' => self::interpolate( $message, $context, $prefix ),
+			'message' => self::interpolate( $message, $context ),
 			'filtered_trace' => $trace->get_filtered_trace(),
 			'component' => $trace->get_component(),
 			'level' => $level,
@@ -256,10 +211,9 @@ protected function store( $level, $message, array $context = array(), string $pr
 	/**
 	 * @param string $message
 	 * @param array<string, mixed> $context
-	 * @param ?string $prefix
 	 * @return string
 	 */
-	protected static function interpolate( $message, array $context = array(), string $prefix = null ) {
+	protected static function interpolate( $message, array $context = array() ) {
 		// build a replacement array with braces around the context keys
 		$replace = array();
 
@@ -269,21 +223,11 @@ protected static function interpolate( $message, array $context = array(), strin
 				$replace[ "{{$key}}" ] = ( $val ? 'true' : 'false' );
 			} elseif ( is_scalar( $val ) ) {
 				$replace[ "{{$key}}" ] = $val;
-			} elseif ( is_object( $val ) ) {
-				$replace[ "{{$key}}" ] = sprintf( '[%s]', get_class( $val ) );
-			} else {
-				$replace[ "{{$key}}" ] = sprintf( '[%s]', gettype( $val ) );
 			}
 		}
 
 		// interpolate replacement values into the message and return
-		$message = strtr( $message, $replace );
-
-		if ( $prefix !== null ) {
-			$message = $prefix . "\n" . $message;
-		}
-
-		return $message;
+		return strtr( $message, $replace );
 	}
 
 	/**
diff --git a/query-monitor/collectors/php_errors.php b/query-monitor/collectors/php_errors.php
index 9aaf0149b7..dac74a4dee 100644
--- a/query-monitor/collectors/php_errors.php
+++ b/query-monitor/collectors/php_errors.php
@@ -124,7 +124,7 @@ public function tear_down() {
 			error_reporting( $this->error_reporting );
 		}
 
-		if ( is_string( $this->display_errors ) ) {
+		if ( false !== $this->display_errors ) {
 			ini_set( 'display_errors', $this->display_errors );
 		}
 
@@ -317,9 +317,8 @@ protected function output_fatal( $error, array $e ) {
 
 		printf(
 			// phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
-			'<link rel="stylesheet" href="%1$s?ver=%2$s" media="all" />',
-			esc_url( QueryMonitor::init()->plugin_url( 'assets/query-monitor.css' ) ),
-			esc_attr( QM_VERSION )
+			'<link rel="stylesheet" href="%s" media="all" />',
+			esc_url( QueryMonitor::init()->plugin_url( 'assets/query-monitor.css' ) )
 		);
 
 		// This unused wrapper with an attribute serves to help the #qm-fatal div break out of an
@@ -341,8 +340,11 @@ protected function output_fatal( $error, array $e ) {
 			$file = esc_html( $e['file'] );
 		}
 
+		$warning = QueryMonitor::icon( 'warning' );
+
 		printf(
-			'<p><b>%1$s</b>: %2$s<br>in <b>%3$s</b> on line <b>%4$d</b></p>',
+			'<p>%1$s <b>%2$s</b>: %3$s<br>in <b>%4$s</b> on line <b>%5$d</b></p>',
+			$warning,
 			esc_html( $error ),
 			nl2br( esc_html( $e['message'] ), false ),
 			$file,
@@ -472,8 +474,8 @@ public function process() {
 	 * Filters the reportable PHP errors using the table specified. Users can customize the levels
 	 * using the `qm/collect/php_error_levels` filter.
 	 *
-	 * @param array<string, int> $components     The error levels keyed by component name.
-	 * @param string             $component_type The component type, for example 'plugin' or 'theme'.
+	 * @param int[]  $components     The error levels keyed by component name.
+	 * @param string $component_type The component type, for example 'plugin' or 'theme'.
 	 * @return void
 	 */
 	public function filter_reportable_errors( array $components, $component_type ) {
diff --git a/query-monitor/collectors/raw_request.php b/query-monitor/collectors/raw_request.php
index edcad78124..5dc8d56ff7 100644
--- a/query-monitor/collectors/raw_request.php
+++ b/query-monitor/collectors/raw_request.php
@@ -51,7 +51,7 @@ protected function get_headers( array $server ) {
 	 */
 	public function process() {
 		$request = array(
-			'ip' => $_SERVER['REMOTE_ADDR'] ?? '',
+			'ip' => $_SERVER['REMOTE_ADDR'],
 			'method' => strtoupper( wp_unslash( $_SERVER['REQUEST_METHOD'] ) ),
 			'scheme' => is_ssl() ? 'https' : 'http',
 			'host' => wp_unslash( $_SERVER['HTTP_HOST'] ),
diff --git a/query-monitor/collectors/theme.php b/query-monitor/collectors/theme.php
index 229cacc64e..1b744b4a07 100644
--- a/query-monitor/collectors/theme.php
+++ b/query-monitor/collectors/theme.php
@@ -69,9 +69,6 @@ public function set_up() {
 		add_action( 'render_block_core_template_part_post', array( $this, 'action_render_block_core_template_part_post' ), 10, 3 );
 		add_action( 'render_block_core_template_part_file', array( $this, 'action_render_block_core_template_part_file' ), 10, 3 );
 		add_action( 'render_block_core_template_part_none', array( $this, 'action_render_block_core_template_part_none' ), 10, 3 );
-		add_action( 'gutenberg_render_block_core_template_part_post', array( $this, 'action_render_block_core_template_part_post' ), 10, 3 );
-		add_action( 'gutenberg_render_block_core_template_part_file', array( $this, 'action_render_block_core_template_part_file' ), 10, 3 );
-		add_action( 'gutenberg_render_block_core_template_part_none', array( $this, 'action_render_block_core_template_part_none' ), 10, 3 );
 	}
 
 	/**
@@ -88,9 +85,6 @@ public function tear_down() {
 		remove_action( 'render_block_core_template_part_post', array( $this, 'action_render_block_core_template_part_post' ), 10 );
 		remove_action( 'render_block_core_template_part_file', array( $this, 'action_render_block_core_template_part_file' ), 10 );
 		remove_action( 'render_block_core_template_part_none', array( $this, 'action_render_block_core_template_part_none' ), 10 );
-		remove_action( 'gutenberg_render_block_core_template_part_post', array( $this, 'action_render_block_core_template_part_post' ), 10 );
-		remove_action( 'gutenberg_render_block_core_template_part_file', array( $this, 'action_render_block_core_template_part_file' ), 10 );
-		remove_action( 'gutenberg_render_block_core_template_part_none', array( $this, 'action_render_block_core_template_part_none' ), 10 );
 
 		parent::tear_down();
 	}
@@ -177,7 +171,11 @@ public static function get_query_template_names() {
 		$names['search'] = 'is_search';
 		$names['front_page'] = 'is_front_page';
 		$names['home'] = 'is_home';
-		$names['privacy_policy'] = 'is_privacy_policy';
+
+		if ( function_exists( 'is_privacy_policy' ) ) {
+			$names['privacy_policy'] = 'is_privacy_policy';
+		}
+
 		$names['post_type_archive'] = 'is_post_type_archive';
 		$names['taxonomy'] = 'is_tax';
 		$names['attachment'] = 'is_attachment';
@@ -195,7 +193,7 @@ public static function get_query_template_names() {
 	}
 
 	/**
-	 * @return array<int|string, string>
+	 * @return string[]
 	 */
 	public static function get_query_filter_names() {
 		$names = array();
@@ -205,7 +203,11 @@ public static function get_query_filter_names() {
 		$names['search'] = 'search_template';
 		$names['front_page'] = 'frontpage_template';
 		$names['home'] = 'home_template';
-		$names['privacy_policy'] = 'privacypolicy_template';
+
+		if ( function_exists( 'is_privacy_policy' ) ) {
+			$names['privacy_policy'] = 'privacypolicy_template';
+		}
+
 		$names['taxonomy'] = 'taxonomy_template';
 		$names['attachment'] = 'attachment_template';
 		$names['single'] = 'single_template';
@@ -249,10 +251,9 @@ public function action_template_redirect() {
 	/**
 	 * Fires before a template part is loaded.
 	 *
-	 * @param string             $slug      The slug name for the generic template.
-	 * @param string             $name      The name of the specialized template or an empty
-	 *                                      string if there is none.
-	 * @param array<int, string> $templates Array of template files to search for, in order.
+	 * @param string   $slug      The slug name for the generic template.
+	 * @param string   $name      The name of the specialized template.
+	 * @param string[] $templates Array of template files to search for, in order.
 	 * @return void
 	 */
 	public function action_get_template_part( $slug, $name, $templates ) {
@@ -356,9 +357,9 @@ public function filter_template_hierarchy( array $templates ) {
 	}
 
 	/**
-	 * @param string             $template  Path to the template. See locate_template().
-	 * @param string             $type      Sanitized filename without extension.
-	 * @param array<int, string> $templates A list of template candidates, in descending order of priority.
+	 * @param string   $template  Path to the template. See locate_template().
+	 * @param string   $type      Sanitized filename without extension.
+	 * @param string[] $templates A list of template candidates, in descending order of priority.
 	 * @return string Full path to template file.
 	 */
 	public function filter_template( $template, $type, $templates ) {
@@ -561,9 +562,9 @@ protected static function wp_get_block_theme_folders() {
 	}
 
 	/**
-	 * @param string             $template_type      The current template type.
-	 * @param array<int, string> $template_hierarchy The current template hierarchy, ordered by priority.
-	 * @param string             $fallback_template  A PHP fallback template to use if no matching block template is found.
+	 * @param string   $template_type      The current template type.
+	 * @param string[] $template_hierarchy The current template hierarchy, ordered by priority.
+	 * @param string   $fallback_template  A PHP fallback template to use if no matching block template is found.
 	 * @return WP_Block_Template|null template A template object, or null if none could be found.
 	 */
 	protected static function wp_resolve_block_template( $template_type, $template_hierarchy, $fallback_template ) {
@@ -571,10 +572,6 @@ protected static function wp_resolve_block_template( $template_type, $template_h
 			return null;
 		}
 
-		if ( ! current_theme_supports( 'block-templates' ) ) {
-			return null;
-		}
-
 		return resolve_block_template( $template_type, $template_hierarchy, $fallback_template );
 	}
 }
diff --git a/query-monitor/composer.json b/query-monitor/composer.json
index 0265614b31..0560a0a273 100644
--- a/query-monitor/composer.json
+++ b/query-monitor/composer.json
@@ -22,8 +22,8 @@
 		}
 	],
 	"require": {
-		"php": ">=7.4.0",
-		"composer/installers": "^1.0 || ^2.0"
+		"php": ">=7.2.0",
+		"composer/installers": "~1.0 || ~2.0"
 	},
 	"require-dev": {
 		"codeception/module-asserts": "^1.0",
@@ -33,14 +33,13 @@
 		"dealerdirect/phpcodesniffer-composer-installer": "0.7.2",
 		"ergebnis/composer-normalize": "^2",
 		"johnbillion/plugin-infrastructure": "dev-trunk",
-		"lucatume/wp-browser": "3.2.1",
+		"lucatume/wp-browser": "^3.0.21",
 		"phpcompatibility/phpcompatibility-wp": "2.1.4",
-		"phpstan/phpstan": "1.10.39",
-		"phpstan/phpstan-phpunit": "1.3.15",
-		"roots/wordpress-core-installer": "1.100.0",
-		"roots/wordpress-full": "*",
+		"phpstan/phpstan": "^1.0",
+		"phpstan/phpstan-phpunit": "^1.0",
+		"roots/wordpress": "*",
 		"squizlabs/php_codesniffer": "3.7.1",
-		"szepeviktor/phpstan-wordpress": "1.3.0",
+		"szepeviktor/phpstan-wordpress": "1.1.6",
 		"wp-coding-standards/wpcs": "2.3.0"
 	},
 	"autoload": {
@@ -68,15 +67,15 @@
 		"sort-packages": true
 	},
 	"extra": {
-		"wordpress-install-dir": "vendor/wordpress/wordpress"
+		"wordpress-install-dir": "vendor/roots/wordpress"
 	},
 	"scripts": {
 		"build-vendor": [
 			"build-vendor"
 		],
 		"test": [
-			"@composer validate --strict --no-check-lock",
-			"@composer normalize --dry-run",
+			"composer validate --strict --no-check-lock",
+			"composer normalize --dry-run",
 			"@test:phpstan",
 			"@test:phpcs",
 			"@test:integration",
@@ -84,16 +83,13 @@
 		],
 		"test:acceptance": [
 			"npm run build",
-			"acceptance-tests"
-		],
-		"test:destroy": [
-			"COMPOSE_PROJECT_NAME=query-monitor docker compose down --volumes --remove-orphans"
+			"bin/acceptance-tests.sh"
 		],
 		"test:integration": [
 			"integration-tests"
 		],
 		"test:phpcs": [
-			"phpcs -nps --colors --report-code --report-summary --report-width=80 --cache=tests/cache/phpcs56.json --basepath='./' --standard=phpcs56.xml",
+			"phpcs -nps --colors --report-code --report-summary --report-width=80 --cache=tests/cache/phpcs.json --basepath='./' --standard=phpcs53.xml",
 			"phpcs -nps --colors --report-code --report-summary --report-width=80 --cache=tests/cache/phpcs.json --basepath='./' ."
 		],
 		"test:phpstan": [
@@ -101,10 +97,10 @@
 			"phpstan analyze --memory-limit=1024M"
 		],
 		"test:start": [
-			"COMPOSE_PROJECT_NAME=query-monitor docker compose up -d"
+			"docker-compose up -d"
 		],
 		"test:stop": [
-			"COMPOSE_PROJECT_NAME=query-monitor docker compose down"
+			"docker-compose down"
 		]
 	}
 }
diff --git a/query-monitor/data/assets.php b/query-monitor/data/assets.php
index 5cfa9b3400..dc3b248be7 100644
--- a/query-monitor/data/assets.php
+++ b/query-monitor/data/assets.php
@@ -46,11 +46,6 @@ class QM_Data_Assets extends QM_Data {
 	 */
 	public $header;
 
-	/**
-	 * @var string
-	 */
-	public $full_host;
-
 	/**
 	 * @var string
 	 */
diff --git a/query-monitor/data/db_queries.php b/query-monitor/data/db_queries.php
index 9d5b6e4653..9b0acb8476 100644
--- a/query-monitor/data/db_queries.php
+++ b/query-monitor/data/db_queries.php
@@ -27,24 +27,9 @@ class QM_Data_DB_Queries extends QM_Data {
 	public $expensive;
 
 	/**
-	 * @var array<int, array<string, mixed>>
-	 */
-	public $rows;
-
-	/**
-	 * @var bool
-	 */
-	public $has_result;
-
-	/**
-	 * @var bool
-	 */
-	public $has_trace;
-
-	/**
-	 * @var bool
+	 * @var ?stdClass
 	 */
-	public $has_main_query;
+	public $wpdb;
 
 	/**
 	 * @var ?array<string, array<string, mixed>>
diff --git a/query-monitor/data/doing_it_wrong.php b/query-monitor/data/doing_it_wrong.php
deleted file mode 100644
index 6f2c694f55..0000000000
--- a/query-monitor/data/doing_it_wrong.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php declare(strict_types = 1);
-/**
- * Doing it Wrong data transfer object.
- *
- * @package query-monitor
- */
-
-class QM_Data_Doing_It_Wrong extends QM_Data {
-	/**
-	 * @var array<int, array<string, mixed>>
-	 * @phpstan-var array<int, array{
-	 *   hook: string,
-	 *   filtered_trace: list<array<string, mixed>>,
-	 *   message: string,
-	 *   component: QM_Component,
-	 * }>
-	 */
-	public $actions;
-}
diff --git a/query-monitor/data/environment.php b/query-monitor/data/environment.php
index 8742660039..fc5e79c1d8 100644
--- a/query-monitor/data/environment.php
+++ b/query-monitor/data/environment.php
@@ -46,7 +46,6 @@ class QM_Data_Environment extends QM_Data {
 	 * @phpstan-var array{
 	 *   version: string,
 	 *   environment_type?: string,
-	 *   development_mode?: string,
 	 *   constants: array<string, string>,
 	 * }>
 	 */
diff --git a/query-monitor/data/http.php b/query-monitor/data/http.php
index 18028e9ef6..5c5ded4fda 100644
--- a/query-monitor/data/http.php
+++ b/query-monitor/data/http.php
@@ -13,11 +13,11 @@ class QM_Data_HTTP extends QM_Data {
 	 *   component: QM_Component,
 	 *   filtered_trace: list<array<string, mixed>>,
 	 *   info: array<string, mixed>|null,
-	 *   host: string,
 	 *   local: bool,
 	 *   ltime: float,
 	 *   redirected_to: string|null,
 	 *   response: mixed[]|WP_Error,
+	 *   transport: string|null,
 	 *   type: string,
 	 *   url: string,
 	 * }>
diff --git a/query-monitor/dispatchers/Html.php b/query-monitor/dispatchers/Html.php
index 17a848a7e9..1b7939984b 100644
--- a/query-monitor/dispatchers/Html.php
+++ b/query-monitor/dispatchers/Html.php
@@ -237,13 +237,13 @@ public function enqueue_assets() {
 			'query-monitor',
 			$this->qm->plugin_url( 'assets/query-monitor.css' ),
 			array(),
-			QM_VERSION
+			$this->qm->plugin_ver( 'assets/query-monitor.css' )
 		);
 		wp_enqueue_script(
 			'query-monitor',
 			$this->qm->plugin_url( 'assets/query-monitor.js' ),
 			$deps,
-			QM_VERSION,
+			$this->qm->plugin_ver( 'assets/query-monitor.js' ),
 			false
 		);
 		wp_localize_script(
@@ -348,7 +348,7 @@ protected function before_output() {
 			require_once $file;
 		}
 
-		/** @var array<string, QM_Output_Html> $outputters */
+		/** @var QM_Output_Html[] */
 		$outputters = $this->get_outputters( 'html' );
 
 		$this->outputters = $outputters;
@@ -561,43 +561,34 @@ protected function after_output() {
 
 		echo '<h3>' . esc_html__( 'Editor', 'query-monitor' ) . '</h3>';
 
-		if ( ! has_filter( 'qm/output/file_link_format' ) ) {
-			echo '<p>' . esc_html__( 'You can set your editor here, so that when you click on stack trace links the file opens in your editor.', 'query-monitor' ) . '</p>';
-
-			echo '<p>';
-			echo '<select id="qm-editor-select" name="qm-editor-select" class="qm-filter">';
-
-			$editors = array(
-				'Default/Xdebug' => '',
-				'Atom' => 'atom',
-				'Netbeans' => 'netbeans',
-				'Nova' => 'nova',
-				'PhpStorm' => 'phpstorm',
-				'Sublime Text' => 'sublime',
-				'TextMate' => 'textmate',
-				'Visual Studio Code' => 'vscode',
-			);
-
-			foreach ( $editors as $name => $value ) {
-				echo '<option value="' . esc_attr( $value ) . '" ' . selected( $value, $editor, false ) . '>' . esc_html( $name ) . '</option>';
-			}
+		echo '<p>' . esc_html__( 'You can set your editor here, so that when you click on stack trace links the file opens in your editor.', 'query-monitor' ) . '</p>';
 
-			echo '</select>';
-			echo '</p><p>';
-			echo '<button class="qm-editor-button qm-button">' . esc_html__( 'Set editor cookie', 'query-monitor' ) . '</button>';
-			echo '</p>';
+		echo '<p>';
+		echo '<select id="qm-editor-select" name="qm-editor-select" class="qm-filter">';
+
+		$editors = array(
+			'Default/Xdebug' => '',
+			'Atom' => 'atom',
+			'Netbeans' => 'netbeans',
+			'PhpStorm' => 'phpstorm',
+			'Sublime Text' => 'sublime',
+			'TextMate' => 'textmate',
+			'Visual Studio Code' => 'vscode',
+		);
 
-			// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-			echo '<p id="qm-editor-save-status">' . $yes . ' ' . esc_html__( 'Saved! Reload to apply changes.', 'query-monitor' ) . '</p>';
-		} else {
-			printf(
-				/* translators: %s: Name of WordPress filter */
-				esc_html__( 'The file link format for your editor is set by the %s filter.', 'query-monitor' ),
-				'<code>qm/output/file_link_format</code>'
-			);
-			echo '</p>';
+		foreach ( $editors as $name => $value ) {
+			echo '<option value="' . esc_attr( $value ) . '" ' . selected( $value, $editor, false ) . '>' . esc_html( $name ) . '</option>';
 		}
 
+		echo '</select>';
+		echo '</p><p>';
+		echo '<button class="qm-editor-button qm-button">' . esc_html__( 'Set editor cookie', 'query-monitor' ) . '</button>';
+		echo '</p>';
+
+		$yes = QueryMonitor::icon( 'yes-alt' );
+
+		// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+		echo '<p id="qm-editor-save-status">' . $yes . ' ' . esc_html__( 'Saved! Reload to apply changes.', 'query-monitor' ) . '</p>';
 		echo '</section>';
 
 		echo '<section>';
@@ -725,8 +716,8 @@ protected function after_output() {
 		 *
 		 * @since  3.1.0
 		 *
-		 * @param QM_Dispatcher_Html            $dispatcher The HTML dispatcher instance.
-		 * @param array<string, QM_Output_Html> $outputters Array of outputters.
+		 * @param QM_Dispatcher_Html $dispatcher The HTML dispatcher instance.
+		 * @param QM_Output_Html[]   $outputters Array of outputters.
 		 */
 		do_action( 'qm/output/after', $this, $this->outputters );
 
@@ -868,12 +859,6 @@ public static function request_supported() {
 			return false;
 		}
 
-		// Don't dispatch on the interim login screen:
-		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		if ( ! empty( $_GET['interim-login'] ) ) {
-			return false;
-		}
-
 		return true;
 	}
 
diff --git a/query-monitor/dispatchers/REST.php b/query-monitor/dispatchers/REST.php
index 164fe49d19..695ebdc7c3 100644
--- a/query-monitor/dispatchers/REST.php
+++ b/query-monitor/dispatchers/REST.php
@@ -16,7 +16,7 @@ class QM_Dispatcher_REST extends QM_Dispatcher {
 	public function __construct( QM_Plugin $qm ) {
 		parent::__construct( $qm );
 
-		add_filter( 'rest_post_dispatch', array( $this, 'filter_rest_post_dispatch' ), 1 );
+		add_filter( 'rest_post_dispatch', array( $this, 'filter_rest_post_dispatch' ), 1, 3 );
 
 	}
 
@@ -24,9 +24,11 @@ public function __construct( QM_Plugin $qm ) {
 	 * Filters a REST API response in order to add QM's headers.
 	 *
 	 * @param WP_HTTP_Response $result  Result to send to the client. Usually a WP_REST_Response.
+	 * @param WP_REST_Server   $server  Server instance.
+	 * @param WP_REST_Request  $request Request used to generate the response.
 	 * @return WP_HTTP_Response Result to send to the client.
 	 */
-	public function filter_rest_post_dispatch( WP_HTTP_Response $result ) {
+	public function filter_rest_post_dispatch( WP_HTTP_Response $result, WP_REST_Server $server, WP_REST_Request $request ) {
 
 		if ( ! $this->should_dispatch() ) {
 			return $result;
@@ -34,10 +36,8 @@ public function filter_rest_post_dispatch( WP_HTTP_Response $result ) {
 
 		$this->before_output();
 
-		/** @var array<string, QM_Output_Headers> $outputters */
-		$outputters = $this->get_outputters( 'headers' );
-
-		foreach ( $outputters as $output ) {
+		/* @var QM_Output_Headers[] */
+		foreach ( $this->get_outputters( 'headers' ) as $id => $output ) {
 			$output->output();
 		}
 
diff --git a/query-monitor/dispatchers/REST_Envelope.php b/query-monitor/dispatchers/REST_Envelope.php
index de914aa719..92afdd5469 100644
--- a/query-monitor/dispatchers/REST_Envelope.php
+++ b/query-monitor/dispatchers/REST_Envelope.php
@@ -31,10 +31,8 @@ public function filter_rest_envelope_response( array $envelope, WP_REST_Response
 
 		$this->before_output();
 
-		/** @var array<string, QM_Output_Raw> $outputters */
-		$outputters = $this->get_outputters( 'raw' );
-
-		foreach ( $outputters as $id => $output ) {
+		/* @var QM_Output_Raw[] */
+		foreach ( $this->get_outputters( 'raw' ) as $id => $output ) {
 			$data[ $id ] = $output->get_output();
 		}
 
diff --git a/query-monitor/dispatchers/Redirect.php b/query-monitor/dispatchers/Redirect.php
index 1d0ee14aa5..c3d144df08 100644
--- a/query-monitor/dispatchers/Redirect.php
+++ b/query-monitor/dispatchers/Redirect.php
@@ -35,10 +35,8 @@ public function filter_wp_redirect( $location, $status ) {
 
 		$this->before_output();
 
-		/** @var array<string, QM_Output_Headers> $outputters */
-		$outputters = $this->get_outputters( 'headers' );
-
-		foreach ( $outputters as $output ) {
+		/* @var QM_Output_Headers[] */
+		foreach ( $this->get_outputters( 'headers' ) as $id => $output ) {
 			$output->output();
 		}
 
diff --git a/query-monitor/output/Html.php b/query-monitor/output/Html.php
index d003846218..1517d170d7 100644
--- a/query-monitor/output/Html.php
+++ b/query-monitor/output/Html.php
@@ -172,7 +172,6 @@ protected function output_concerns() {
 		echo '<thead>';
 		echo '<tr>';
 		echo '<th scope="col">' . esc_html__( 'Hook', 'query-monitor' ) . '</th>';
-		echo '<th scope="col">' . esc_html__( 'Type', 'query-monitor' ) . '</th>';
 		echo '<th scope="col">' . esc_html__( 'Priority', 'query-monitor' ) . '</th>';
 		echo '<th scope="col">' . esc_html__( 'Callback', 'query-monitor' ) . '</th>';
 		echo '<th scope="col">' . esc_html__( 'Component', 'query-monitor' ) . '</th>';
@@ -186,7 +185,7 @@ protected function output_concerns() {
 				continue;
 			}
 
-			QM_Output_Html_Hooks::output_hook_table( $this->collector->$key, true );
+			QM_Output_Html_Hooks::output_hook_table( $this->collector->$key );
 		}
 
 		echo '</tbody>';
@@ -561,8 +560,6 @@ public static function get_editor_file_link_format( $editor, $default_format ) {
 				return 'txmt://open/?url=file://%f&line=%l';
 			case 'netbeans':
 				return 'nbopen://%f:%l';
-			case 'nova':
-				return 'nova://open?path=%f&line=%l';
 			default:
 				return $default_format;
 		}
@@ -611,7 +608,7 @@ public static function get_file_path_map() {
 		 * @link https://querymonitor.com/blog/2019/02/clickable-stack-traces-and-function-names-in-query-monitor/
 		 * @since 3.0.0
 		 *
-		 * @param array<string, string> $file_map Array of file path mappings. Keys are the source paths and values are the replacement paths.
+		 * @param string[] $file_map Array of file path mappings. Keys are the source paths and values are the replacement paths.
 		 */
 		return apply_filters( 'qm/output/file_path_map', array() );
 	}
diff --git a/query-monitor/output/html/assets.php b/query-monitor/output/html/assets.php
index 5636edaa53..c0cedb7741 100644
--- a/query-monitor/output/html/assets.php
+++ b/query-monitor/output/html/assets.php
@@ -69,7 +69,7 @@ public function output() {
 		echo '<th scope="col" class="qm-filterable-column">';
 		$args = array(
 			'prepend' => array(
-				'local' => $data->full_host,
+				'local' => $data->host,
 			),
 		);
 		echo $this->build_filter( $type . '-host', $hosts, __( 'Host', 'query-monitor' ), $args ); // WPCS: XSS ok.
diff --git a/query-monitor/output/html/db_callers.php b/query-monitor/output/html/db_callers.php
index c03751b2ed..1461d0b260 100644
--- a/query-monitor/output/html/db_callers.php
+++ b/query-monitor/output/html/db_callers.php
@@ -50,7 +50,7 @@ public function output() {
 			echo '<tr>';
 			echo '<th scope="col">' . esc_html__( 'Caller', 'query-monitor' ) . '</th>';
 
-			foreach ( array_keys( $data->types ) as $type_name ) {
+			foreach ( $data->types as $type_name => $type_count ) {
 				echo '<th scope="col" class="qm-num qm-ltr qm-sortable-column" role="columnheader">';
 				echo $this->build_sorter( $type_name ); // WPCS: XSS ok;
 				echo '</th>';
@@ -73,7 +73,7 @@ public function output() {
 				echo self::build_filter_trigger( 'db_queries', 'caller', $row['caller'], '<code>' . esc_html( $row['caller'] ) . '</code>' ); // WPCS: XSS ok;
 				echo '</td>';
 
-				foreach ( array_keys( $data->types ) as $type_name ) {
+				foreach ( $data->types as $type_name => $type_count ) {
 					if ( isset( $row['types'][ $type_name ] ) ) {
 						echo "<td class='qm-num'>" . esc_html( number_format_i18n( $row['types'][ $type_name ] ) ) . '</td>';
 					} else {
diff --git a/query-monitor/output/html/db_queries.php b/query-monitor/output/html/db_queries.php
index fe9115fa5d..dc0f952410 100644
--- a/query-monitor/output/html/db_queries.php
+++ b/query-monitor/output/html/db_queries.php
@@ -45,7 +45,7 @@ public function output() {
 		/** @var QM_Data_DB_Queries $data */
 		$data = $this->collector->get_data();
 
-		if ( empty( $data->rows ) ) {
+		if ( empty( $data->wpdb ) ) {
 			$this->output_empty_queries();
 			return;
 		}
@@ -58,7 +58,7 @@ public function output() {
 			$this->output_expensive_queries( $data->expensive );
 		}
 
-		$this->output_queries( $data );
+		$this->output_queries( $data->wpdb, $data );
 	}
 
 	/**
@@ -151,149 +151,159 @@ protected function output_expensive_queries( array $expensive ) {
 	}
 
 	/**
+	 * @param stdClass $db
 	 * @param QM_Data_DB_Queries $data
 	 * @return void
 	 */
-	protected function output_queries( QM_Data_DB_Queries $data ) {
+	protected function output_queries( stdClass $db, QM_Data_DB_Queries $data ) {
 		$this->query_row = 0;
 		$span = 4;
 
-		if ( $data->has_result ) {
+		if ( $db->has_result ) {
 			$span++;
 		}
-		if ( $data->has_trace ) {
+		if ( $db->has_trace ) {
 			$span++;
 		}
 
-		$this->before_tabular_output();
+		if ( ! empty( $db->rows ) ) {
+			$this->before_tabular_output();
 
-		echo '<thead>';
+			echo '<thead>';
 
-		/**
-		 * Filter whether to show the QM extended query information prompt.
-		 *
-		 * By default QM shows a prompt to install the QM db.php drop-in,
-		 * this filter allows a dev to choose not to show the prompt.
-		 *
-		 * @since 2.9.0
-		 *
-		 * @param bool $show_prompt Whether to show the prompt.
-		 */
-		if ( apply_filters( 'qm/show_extended_query_prompt', true ) && ! $data->has_trace ) {
-			echo '<tr>';
-			// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-			echo '<th colspan="' . intval( $span ) . '" class="qm-warn">' . QueryMonitor::icon( 'warning' );
-			if ( file_exists( WP_CONTENT_DIR . '/db.php' ) ) {
-				/* translators: %s: File name */
-				$message = __( 'Extended query information such as the component and affected rows is not available. A conflicting %s file is present.', 'query-monitor' );
-			} elseif ( defined( 'QM_DB_SYMLINK' ) && ! QM_DB_SYMLINK ) {
-				/* translators: 1: File name, 2: Configuration constant name */
-				$message = __( 'Extended query information such as the component and affected rows is not available. Query Monitor was prevented from symlinking its %1$s file into place by the %2$s constant.', 'query-monitor' );
-			} else {
-				/* translators: %s: File name */
-				$message = __( 'Extended query information such as the component and affected rows is not available. Query Monitor was unable to symlink its %s file into place.', 'query-monitor' );
-			}
-			printf(
-				esc_html( $message ),
-				'<code>db.php</code>',
-				'<code>QM_DB_SYMLINK</code>'
-			);
+			/**
+			 * Filter whether to show the QM extended query information prompt.
+			 *
+			 * By default QM shows a prompt to install the QM db.php drop-in,
+			 * this filter allows a dev to choose not to show the prompt.
+			 *
+			 * @since 2.9.0
+			 *
+			 * @param bool $show_prompt Whether to show the prompt.
+			 */
+			if ( apply_filters( 'qm/show_extended_query_prompt', true ) && ! $db->has_trace ) {
+				echo '<tr>';
+				// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+				echo '<th colspan="' . intval( $span ) . '" class="qm-warn">' . QueryMonitor::icon( 'warning' );
+				if ( file_exists( WP_CONTENT_DIR . '/db.php' ) ) {
+					/* translators: %s: File name */
+					$message = __( 'Extended query information such as the component and affected rows is not available. A conflicting %s file is present.', 'query-monitor' );
+				} elseif ( defined( 'QM_DB_SYMLINK' ) && ! QM_DB_SYMLINK ) {
+					/* translators: 1: File name, 2: Configuration constant name */
+					$message = __( 'Extended query information such as the component and affected rows is not available. Query Monitor was prevented from symlinking its %1$s file into place by the %2$s constant.', 'query-monitor' );
+				} else {
+					/* translators: %s: File name */
+					$message = __( 'Extended query information such as the component and affected rows is not available. Query Monitor was unable to symlink its %s file into place.', 'query-monitor' );
+				}
+				printf(
+					esc_html( $message ),
+					'<code>db.php</code>',
+					'<code>QM_DB_SYMLINK</code>'
+				);
 
-			printf(
-				' <a href="%s" target="_blank" class="qm-external-link">See this wiki page for more information.</a>',
-				'https://github.com/johnbillion/query-monitor/wiki/db.php-Symlink'
-			);
-			echo '</th>';
-			echo '</tr>';
-		}
+				printf(
+					' <a href="%s" target="_blank" class="qm-external-link">See this wiki page for more information.</a>',
+					'https://github.com/johnbillion/query-monitor/wiki/db.php-Symlink'
+				);
+				echo '</th>';
+				echo '</tr>';
+			}
 
-		$types = array_keys( $data->types );
-		$prepend = array();
-		$callers = array_column( $data->times, 'caller' );
+			$types = array_keys( $db->types );
+			$prepend = array();
+			$callers = array_column( $data->times, 'caller' );
 
-		sort( $types );
-		usort( $callers, 'strcasecmp' );
+			sort( $types );
+			usort( $callers, 'strcasecmp' );
 
-		if ( count( $types ) > 1 ) {
-			$prepend['non-select'] = __( 'Non-SELECT', 'query-monitor' );
-		}
+			if ( count( $types ) > 1 ) {
+				$prepend['non-select'] = __( 'Non-SELECT', 'query-monitor' );
+			}
 
-		$args = array(
-			'prepend' => $prepend,
-		);
+			$args = array(
+				'prepend' => $prepend,
+			);
 
-		echo '<tr>';
-		echo '<th scope="col" class="qm-sorted-asc qm-sortable-column" role="columnheader" aria-sort="ascending">';
-		echo $this->build_sorter( '#' ); // WPCS: XSS ok;
-		echo '</th>';
-		echo '<th scope="col" class="qm-filterable-column">';
-		echo $this->build_filter( 'type', $types, __( 'Query', 'query-monitor' ), $args ); // WPCS: XSS ok;
-		echo '</th>';
-		echo '<th scope="col" class="qm-filterable-column">';
+			echo '<tr>';
+			echo '<th scope="col" class="qm-sorted-asc qm-sortable-column" role="columnheader" aria-sort="ascending">';
+			echo $this->build_sorter( '#' ); // WPCS: XSS ok;
+			echo '</th>';
+			echo '<th scope="col" class="qm-filterable-column">';
+			echo $this->build_filter( 'type', $types, __( 'Query', 'query-monitor' ), $args ); // WPCS: XSS ok;
+			echo '</th>';
+			echo '<th scope="col" class="qm-filterable-column">';
 
-		$prepend = array();
+			$prepend = array();
 
-		if ( $data->has_main_query ) {
-			$prepend['qm-main-query'] = __( 'Main Query', 'query-monitor' );
-		}
+			if ( $db->has_main_query ) {
+				$prepend['qm-main-query'] = __( 'Main Query', 'query-monitor' );
+			}
 
-		$args = array(
-			'prepend' => $prepend,
-		);
-		echo $this->build_filter( 'caller', $callers, __( 'Caller', 'query-monitor' ), $args ); // WPCS: XSS ok.
-		echo '</th>';
+			$args = array(
+				'prepend' => $prepend,
+			);
+			echo $this->build_filter( 'caller', $callers, __( 'Caller', 'query-monitor' ), $args ); // WPCS: XSS ok.
+			echo '</th>';
 
-		if ( $data->has_trace ) {
-			$components = array_column( $data->component_times, 'component' );
+			if ( $db->has_trace ) {
+				$components = array_column( $data->component_times, 'component' );
 
-			usort( $components, 'strcasecmp' );
+				usort( $components, 'strcasecmp' );
 
-			echo '<th scope="col" class="qm-filterable-column">';
-			echo $this->build_filter( 'component', $components, __( 'Component', 'query-monitor' ) ); // WPCS: XSS ok.
-			echo '</th>';
-		}
+				echo '<th scope="col" class="qm-filterable-column">';
+				echo $this->build_filter( 'component', $components, __( 'Component', 'query-monitor' ) ); // WPCS: XSS ok.
+				echo '</th>';
+			}
 
-		if ( $data->has_result ) {
-			if ( empty( $data->errors ) ) {
-				$class = 'qm-num';
-			} else {
-				$class = '';
+			if ( $db->has_result ) {
+				if ( empty( $data->errors ) ) {
+					$class = 'qm-num';
+				} else {
+					$class = '';
+				}
+				echo '<th scope="col" class="' . esc_attr( $class ) . ' qm-sortable-column" role="columnheader">';
+				echo $this->build_sorter( __( 'Rows', 'query-monitor' ) ); // WPCS: XSS ok.
+				echo '</th>';
 			}
-			echo '<th scope="col" class="' . esc_attr( $class ) . ' qm-sortable-column" role="columnheader">';
-			echo $this->build_sorter( __( 'Rows', 'query-monitor' ) ); // WPCS: XSS ok.
+
+			echo '<th scope="col" class="qm-num qm-sortable-column" role="columnheader">';
+			echo $this->build_sorter( __( 'Time', 'query-monitor' ) ); // WPCS: XSS ok.
 			echo '</th>';
-		}
+			echo '</tr>';
+			echo '</thead>';
 
-		echo '<th scope="col" class="qm-num qm-sortable-column" role="columnheader">';
-		echo $this->build_sorter( __( 'Time', 'query-monitor' ) ); // WPCS: XSS ok.
-		echo '</th>';
-		echo '</tr>';
-		echo '</thead>';
+			echo '<tbody>';
 
-		echo '<tbody>';
+			foreach ( $db->rows as $row ) {
+				$this->output_query_row( $row, array( 'row', 'sql', 'caller', 'component', 'result', 'time' ) );
+			}
 
-		foreach ( $data->rows as $row ) {
-			$this->output_query_row( $row, array( 'row', 'sql', 'caller', 'component', 'result', 'time' ) );
-		}
+			echo '</tbody>';
+			echo '<tfoot>';
 
-		echo '</tbody>';
-		echo '<tfoot>';
+			$total_stime = number_format_i18n( $db->total_time, 4 );
 
-		$total_stime = number_format_i18n( $data->total_time, 4 );
+			echo '<tr>';
+			echo '<td colspan="' . intval( $span - 1 ) . '">';
+			printf(
+				/* translators: %s: Number of database queries */
+				esc_html( _nx( 'Total: %s', 'Total: %s', $db->total_qs, 'Query count', 'query-monitor' ) ),
+				'<span class="qm-items-number">' . esc_html( number_format_i18n( $db->total_qs ) ) . '</span>'
+			);
+			echo '</td>';
+			echo '<td class="qm-num qm-items-time">' . esc_html( $total_stime ) . '</td>';
+			echo '</tr>';
+			echo '</tfoot>';
 
-		echo '<tr>';
-		echo '<td colspan="' . intval( $span - 1 ) . '">';
-		printf(
-			/* translators: %s: Number of database queries */
-			esc_html( _nx( 'Total: %s', 'Total: %s', $data->total_qs, 'Query count', 'query-monitor' ) ),
-			'<span class="qm-items-number">' . esc_html( number_format_i18n( $data->total_qs ) ) . '</span>'
-		);
-		echo '</td>';
-		echo '<td class="qm-num qm-items-time">' . esc_html( $total_stime ) . '</td>';
-		echo '</tr>';
-		echo '</tfoot>';
+			$this->after_tabular_output();
+		} else {
+			$this->before_non_tabular_output();
 
-		$this->after_tabular_output();
+			$notice = __( 'No queries! Nice work.', 'query-monitor' );
+			echo $this->build_notice( $notice ); // WPCS: XSS ok.
+
+			$this->after_non_tabular_output();
+		}
 	}
 
 	/**
@@ -481,15 +491,15 @@ public function admin_title( array $title ) {
 		/** @var QM_Data_DB_Queries $data */
 		$data = $this->collector->get_data();
 
-		if ( isset( $data->rows ) ) {
+		if ( isset( $data->wpdb ) ) {
 			$title[] = sprintf(
 				/* translators: %s: A time in seconds with a decimal fraction. No space between value and unit symbol. */
 				esc_html_x( '%ss', 'Time in seconds', 'query-monitor' ),
-				number_format_i18n( $data->total_time, 2 )
+				number_format_i18n( $data->wpdb->total_time, 2 )
 			);
 
 			/* translators: %s: Number of database queries. Note the space between value and unit symbol. */
-			$text = _n( '%s Q', '%s Q', $data->total_qs, 'query-monitor' );
+			$text = _n( '%s Q', '%s Q', $data->wpdb->total_qs, 'query-monitor' );
 
 			// Avoid a potentially blank translation for the plural form.
 			// @see https://meta.trac.wordpress.org/ticket/5377
@@ -499,7 +509,7 @@ public function admin_title( array $title ) {
 
 			$title[] = preg_replace( '#\s?([^0-9,\.]+)#', '<small>$1</small>', sprintf(
 				esc_html( $text ),
-				number_format_i18n( $data->total_qs )
+				number_format_i18n( $data->wpdb->total_qs )
 			) );
 		} elseif ( isset( $data->total_qs ) ) {
 			/* translators: %s: Number of database queries. Note the space between value and unit symbol. */
diff --git a/query-monitor/output/html/doing_it_wrong.php b/query-monitor/output/html/doing_it_wrong.php
deleted file mode 100644
index 0b1e0589de..0000000000
--- a/query-monitor/output/html/doing_it_wrong.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php declare(strict_types = 1);
-/**
- * Doing it Wrong output for HTML pages.
- *
- * @package query-monitor
- */
-
-if ( ! defined( 'ABSPATH' ) ) {
-	exit;
-}
-
-class QM_Output_Html_Doing_It_Wrong extends QM_Output_Html {
-
-	/**
-	 * Collector instance.
-	 *
-	 * @var QM_Collector_Doing_It_Wrong Collector.
-	 */
-	protected $collector;
-
-	public function __construct( QM_Collector $collector ) {
-		parent::__construct( $collector );
-		add_filter( 'qm/output/menus', array( $this, 'admin_menu' ), 15 );
-		add_filter( 'qm/output/menu_class', array( $this, 'admin_class' ) );
-	}
-
-	/**
-	 * @return string
-	 */
-	public function name() {
-		return __( 'Doing it Wrong', 'query-monitor' );
-	}
-
-	/**
-	 * @return array<string, string>
-	 */
-	public function get_type_labels() {
-		return array(
-			/* translators: %s: Total number of Doing it Wrong occurrences */
-			'total' => _x( 'Total: %s', 'Doing it Wrong', 'query-monitor' ),
-			'plural' => __( 'Doing it Wrong occurrences', 'query-monitor' ),
-			/* translators: %s: Total number of Doing it Wrong occurrences */
-			'count' => _x( 'Doing it Wrong (%s)', 'Doing it Wrong', 'query-monitor' ),
-		);
-	}
-
-	/**
-	 * @return void
-	 */
-	public function output() {
-		/** @var QM_Data_Doing_It_Wrong $data */
-		$data = $this->collector->get_data();
-
-		if ( empty( $data->actions ) ) {
-			$this->before_non_tabular_output();
-
-			$notice = __( 'No occurrences.', 'query-monitor' );
-			echo $this->build_notice( $notice ); // WPCS: XSS ok.
-
-			$this->after_non_tabular_output();
-
-			return;
-		}
-
-		$this->before_tabular_output();
-
-		echo '<thead>';
-		echo '<tr>';
-		echo '<th scope="col">' . esc_html__( 'Message', 'query-monitor' ) . '</th>';
-		echo '<th scope="col">' . esc_html__( 'Caller', 'query-monitor' ) . '</th>';
-		echo '<th scope="col">' . esc_html__( 'Component', 'query-monitor' ) . '</th>';
-		echo '</tr>';
-		echo '</thead>';
-
-		echo '<tbody>';
-
-		foreach ( $data->actions as $row ) {
-			$stack = array();
-
-			foreach ( $row['filtered_trace'] as $frame ) {
-				$stack[] = self::output_filename( $frame['display'], $frame['calling_file'], $frame['calling_line'] );
-			}
-
-			$caller = array_shift( $stack );
-
-			echo '<tr>';
-
-			printf( '<td>%s</td>', esc_html( wp_strip_all_tags( $row['message'] ) ) );
-
-			echo '<td class="qm-has-toggle qm-nowrap qm-ltr">';
-
-			if ( ! empty( $stack ) ) {
-				echo self::build_toggler(); // WPCS: XSS ok;
-			}
-
-			echo '<ol>';
-
-			echo "<li>{$caller}</li>"; // WPCS: XSS ok.
-
-			if ( ! empty( $stack ) ) {
-				echo '<div class="qm-toggled"><li>' . implode( '</li><li>', $stack ) . '</li></div>'; // WPCS: XSS ok.
-			}
-
-			echo '</ol></td>';
-
-			echo '<td class="qm-nowrap">' . esc_html( $row['component']->name ) . '</td>';
-
-			echo '</tr>';
-		}
-
-		echo '</tbody>';
-
-		echo '<tfoot>';
-		printf(
-			'<tr><td colspan="3">%s</td></tr>',
-			sprintf(
-				/* translators: %s: Total number of Doing it Wrong occurrences */
-				esc_html_x( 'Total: %s', 'Total Doing it Wrong occurrences', 'query-monitor' ),
-				'<span class="qm-items-number">' . esc_html( number_format_i18n( count( $data->actions ) ) ) . '</span>'
-			)
-		);
-		echo '</tfoot>';
-
-		$this->after_tabular_output();
-
-	}
-
-	/**
-	 * @param array<int, string> $class
-	 * @return array<int, string>
-	 */
-	public function admin_class( array $class ) {
-		/** @var QM_Data_Doing_It_Wrong */
-		$data = $this->collector->get_data();
-
-		if ( ! empty( $data->actions ) ) {
-			$class[] = 'qm-notice';
-		}
-
-		return $class;
-
-	}
-
-	/**
-	 * @param array<string, mixed[]> $menu
-	 * @return array<string, mixed[]>
-	 */
-	public function admin_menu( array $menu ) {
-		/** @var QM_Data_Doing_It_Wrong */
-		$data = $this->collector->get_data();
-
-		if ( empty( $data->actions ) ) {
-			return $menu;
-		}
-
-		$type_label = $this->get_type_labels();
-		$label = sprintf(
-			$type_label['count'],
-			number_format_i18n( count( $data->actions ) )
-		);
-
-		$args = array(
-			'title' => esc_html( $label ),
-			'id'    => esc_attr( "query-monitor-{$this->collector->id}" ),
-			'href'  => esc_attr( '#' . $this->collector->id() ),
-		);
-
-		if ( ! empty( $data->actions ) ) {
-			$args['meta']['classname'] = 'qm-notice';
-		}
-
-		$id = $this->collector->id();
-		$menu[ $id ] = $this->menu( $args );
-
-		return $menu;
-
-	}
-
-}
-
-/**
- * @param array<string, QM_Output> $output
- * @param QM_Collectors $collectors
- * @return array<string, QM_Output>
- */
-function register_qm_output_html_doing_it_wrong( array $output, QM_Collectors $collectors ) {
-	$collector = QM_Collectors::get( 'doing_it_wrong' );
-	if ( $collector ) {
-		$output['doing_it_wrong'] = new QM_Output_Html_Doing_It_Wrong( $collector );
-	}
-	return $output;
-}
-
-add_filter( 'qm/outputter/html', 'register_qm_output_html_doing_it_wrong', 110, 2 );
diff --git a/query-monitor/output/html/environment.php b/query-monitor/output/html/environment.php
index 76d4a06481..1a339319de 100644
--- a/query-monitor/output/html/environment.php
+++ b/query-monitor/output/html/environment.php
@@ -235,26 +235,6 @@ public function output() {
 			echo '</tr>';
 		}
 
-		if ( isset( $data->wp['development_mode'] ) ) {
-			$mode = $data->wp['development_mode'];
-
-			if ( '' === $mode ) {
-				$mode = __( 'empty string', 'query-monitor' );
-			}
-
-			echo '<tr>';
-			echo '<th scope="row">';
-			esc_html_e( 'Development Mode', 'query-monitor' );
-			printf(
-				'&nbsp;<span class="qm-info">(<a href="%s" target="_blank" class="qm-external-link">%s</a>)</span>',
-				'https://core.trac.wordpress.org/changeset/56042',
-				esc_html__( 'Help', 'query-monitor' )
-			);
-			echo '</th>';
-			echo '<td>' . esc_html( $mode ) . '</td>';
-			echo '</tr>';
-		}
-
 		foreach ( $data->wp['constants'] as $key => $val ) {
 
 			echo '<tr>';
diff --git a/query-monitor/output/html/hooks.php b/query-monitor/output/html/hooks.php
index 89fa40e6d3..769c69e616 100644
--- a/query-monitor/output/html/hooks.php
+++ b/query-monitor/output/html/hooks.php
@@ -27,16 +27,7 @@ public function __construct( QM_Collector $collector ) {
 	 * @return string
 	 */
 	public function name() {
-		/** @var QM_Data_Hooks */
-		$data = $this->collector->get_data();
-
-		$name = __( 'Hooks & Actions', 'query-monitor' );
-
-		if ( $data->all_hooks ) {
-			$name = __( 'Hooks, Actions, & Filters', 'query-monitor' );
-		}
-
-		return $name;
+		return __( 'Hooks & Actions', 'query-monitor' );
 	}
 
 	/**
@@ -52,23 +43,13 @@ public function output() {
 
 		$this->before_tabular_output();
 
-		$callback_label = __( 'Action', 'query-monitor' );
-		$th_type = '';
-
-		if ( $data->all_hooks ) {
-			$callback_label = __( 'Callback', 'query-monitor' );
-			$th_type = '<th scope="col" class="qm-filterable-column">' . $this->build_filter( 'type', array(
-				'action' => __( 'Action', 'query-monitor' ),
-				'filter' => __( 'Filter', 'query-monitor' ),
-			), __( 'Type', 'query-monitor' ) ) . '</th>';
-		}
+		$callback_label = $data->all_hooks ? __( 'Callback', 'query-monitor' ) : __( 'Action', 'query-monitor' );
 
 		echo '<thead>';
 		echo '<tr>';
 		echo '<th scope="col" class="qm-filterable-column">';
 		echo $this->build_filter( 'name', $data->parts, __( 'Hook', 'query-monitor' ) ); // WPCS: XSS ok.
 		echo '</th>';
-		echo $th_type; // WPCS: XSS ok.
 		echo '<th scope="col">' . esc_html__( 'Priority', 'query-monitor' ) . '</th>';
 		echo '<th scope="col">' . esc_html( $callback_label ) . '</th>';
 		echo '<th scope="col" class="qm-filterable-column">';
@@ -80,7 +61,7 @@ public function output() {
 		echo '</thead>';
 
 		echo '<tbody>';
-		self::output_hook_table( $data->hooks, $data->all_hooks );
+		self::output_hook_table( $data->hooks );
 		echo '</tbody>';
 
 		$this->after_tabular_output();
@@ -88,17 +69,15 @@ public function output() {
 
 	/**
 	 * @param array<int, mixed[]> $hooks
-	 * @param bool                $all_hooks
 	 * @return void
 	 */
-	public static function output_hook_table( array $hooks, bool $all_hooks ) {
+	public static function output_hook_table( array $hooks ) {
 		$core = __( 'WordPress Core', 'query-monitor' );
 
 		foreach ( $hooks as $hook ) {
 			$row_attr = array();
 			$row_attr['data-qm-name'] = implode( ' ', $hook['parts'] );
 			$row_attr['data-qm-component'] = implode( ' ', $hook['components'] );
-			$row_attr['data-qm-type'] = $hook['type'];
 
 			if ( ! empty( $row_attr['data-qm-component'] ) && $core !== $row_attr['data-qm-component'] ) {
 				$row_attr['data-qm-component'] .= ' non-core';
@@ -155,10 +134,6 @@ public static function output_hook_table( array $hooks, bool $all_hooks ) {
 						}
 						echo '</span></th>';
 
-						if ( $all_hooks ) {
-							$type = ( 'action' === $hook['type'] ) ? __( 'Action', 'query-monitor' ) : __( 'Filter', 'query-monitor' );
-							echo '<td rowspan="' . intval( $rowspan ) . '" class="qm-nowrap qm-ltr"><span class="qm-sticky">' . esc_html( $type ) . '</td>';
-						}
 					}
 
 					if ( isset( $action['callback']['error'] ) ) {
@@ -226,11 +201,6 @@ public static function output_hook_table( array $hooks, bool $all_hooks ) {
 				echo '<td></td>';
 				echo '<td></td>';
 				echo '<td></td>';
-
-				if ( $all_hooks ) {
-					echo '<td></td>';
-				}
-
 				echo '</tr>';
 			}
 		}
diff --git a/query-monitor/output/html/http.php b/query-monitor/output/html/http.php
index 8da2990ac4..509f4f7144 100644
--- a/query-monitor/output/html/http.php
+++ b/query-monitor/output/html/http.php
@@ -46,8 +46,6 @@ public function output() {
 			usort( $components, 'strcasecmp' );
 
 			$status_output = array();
-			$hosts = array_unique( array_column( $data->http, 'host' ) );
-			sort( $hosts );
 
 			foreach ( $statuses as $status ) {
 				if ( 'error' === $status ) {
@@ -65,9 +63,7 @@ public function output() {
 			echo '<thead>';
 			echo '<tr>';
 			echo '<th scope="col">' . esc_html__( 'Method', 'query-monitor' ) . '</th>';
-			echo '<th scope="col" class="qm-filterable-column">';
-			echo $this->build_filter( 'host', $hosts, __( 'URL', 'query-monitor' ) ); // WPCS: XSS ok.
-			echo '</th>';
+			echo '<th scope="col">' . esc_html__( 'URL', 'query-monitor' ) . '</th>';
 			echo '<th scope="col" class="qm-filterable-column">';
 			echo $this->build_filter( 'type', $status_output, __( 'Status', 'query-monitor' ) ); // WPCS: XSS ok.
 			echo '</th>';
@@ -143,7 +139,6 @@ public function output() {
 				$row_attr['data-qm-component'] = $component->name;
 				$row_attr['data-qm-type'] = $row['type'];
 				$row_attr['data-qm-time'] = $row['ltime'];
-				$row_attr['data-qm-host'] = $row['host'];
 
 				if ( 'core' !== $component->context ) {
 					$row_attr['data-qm-component'] .= ' non-core';
@@ -180,7 +175,7 @@ public function output() {
 					$url
 				);
 
-				$show_toggle = ! empty( $row['info'] );
+				$show_toggle = ( ! empty( $row['transport'] ) && ! empty( $row['info'] ) );
 
 				echo '<td class="qm-has-toggle qm-col-status">';
 				if ( $is_error ) {
@@ -194,6 +189,18 @@ public function output() {
 					echo '<ul class="qm-toggled">';
 				}
 
+				if ( ! empty( $row['transport'] ) ) {
+					$transport = sprintf(
+						/* translators: %s HTTP API transport name */
+						__( 'HTTP API Transport: %s', 'query-monitor' ),
+						$row['transport']
+					);
+					printf(
+						'<li><span class="qm-info qm-supplemental">%s</span></li>',
+						esc_html( $transport )
+					);
+				}
+
 				if ( ! empty( $row['info'] ) ) {
 					$time_fields = array(
 						'namelookup_time' => __( 'DNS Resolution Time', 'query-monitor' ),
diff --git a/query-monitor/output/html/php_errors.php b/query-monitor/output/html/php_errors.php
index 5d644fccf0..f119d54685 100644
--- a/query-monitor/output/html/php_errors.php
+++ b/query-monitor/output/html/php_errors.php
@@ -50,7 +50,6 @@ public function output() {
 			'Deprecated',
 		);
 		$components = $data->components;
-		$count = 0;
 
 		usort( $components, 'strcasecmp' );
 
@@ -62,8 +61,8 @@ public function output() {
 		echo $this->build_filter( 'type', $levels, __( 'Level', 'query-monitor' ) ); // WPCS: XSS ok.
 		echo '</th>';
 		echo '<th scope="col" class="qm-col-message">' . esc_html__( 'Message', 'query-monitor' ) . '</th>';
-		echo '<th scope="col">' . esc_html__( 'Location', 'query-monitor' ) . '</th>';
 		echo '<th scope="col" class="qm-num">' . esc_html__( 'Count', 'query-monitor' ) . '</th>';
+		echo '<th scope="col">' . esc_html__( 'Location', 'query-monitor' ) . '</th>';
 		echo '<th scope="col" class="qm-filterable-column">';
 		echo $this->build_filter( 'component', $components, __( 'Component', 'query-monitor' ) ); // WPCS: XSS ok.
 		echo '</th>';
@@ -80,12 +79,10 @@ public function output() {
 				}
 
 				foreach ( $data->{$error_group}[ $type ] as $error_key => $error ) {
-					$count += $error['calls'];
 
 					$row_attr = array();
 					$row_attr['data-qm-type'] = ucfirst( $type );
 					$row_attr['data-qm-key'] = $error_key;
-					$row_attr['data-qm-count'] = $error['calls'];
 
 					if ( $error['component'] ) {
 						$component = $error['component'];
@@ -125,6 +122,7 @@ public function output() {
 					echo '</td>';
 
 					echo '<td class="qm-ltr">' . esc_html( $error['message'] ) . '</td>';
+					echo '<td class="qm-num">' . esc_html( number_format_i18n( $error['calls'] ) ) . '</td>';
 
 					$stack = array();
 
@@ -162,7 +160,6 @@ public function output() {
 					}
 
 					echo '</ol></td>';
-					echo '<td class="qm-num">' . esc_html( number_format_i18n( $error['calls'] ) ) . '</td>';
 
 					if ( ! empty( $component ) ) {
 						echo '<td class="qm-nowrap">' . esc_html( $component->name ) . '</td>';
@@ -177,18 +174,6 @@ public function output() {
 
 		echo '</tbody>';
 
-		echo '<tfoot>';
-		echo '<tr>';
-		echo '<td colspan="5">';
-		printf(
-			/* translators: %s: Number of PHP errors */
-			esc_html( _nx( 'Total: %s', 'Total: %s', $count, 'PHP error count', 'query-monitor' ) ),
-			'<span class="qm-items-number">' . esc_html( number_format_i18n( $count ) ) . '</span>'
-		);
-		echo '</td>';
-		echo '</tr>';
-		echo '</tfoot>';
-
 		$this->after_tabular_output();
 	}
 
diff --git a/query-monitor/output/html/request.php b/query-monitor/output/html/request.php
index 5007b2d7e2..3bb8eae40f 100644
--- a/query-monitor/output/html/request.php
+++ b/query-monitor/output/html/request.php
@@ -102,7 +102,7 @@ public function output() {
 
 		if ( $db_queries ) {
 			$db_queries_data = $db_queries->get_data();
-			if ( $db_queries_data->has_main_query ) {
+			if ( ! empty( $db_queries_data->wpdb->has_main_query ) ) {
 				echo '<p>';
 				echo self::build_filter_trigger( 'db_queries', 'caller', 'qm-main-query', esc_html__( 'View Main Query', 'query-monitor' ) ); // WPCS: XSS ok;
 				echo '</p>';
diff --git a/query-monitor/output/html/theme.php b/query-monitor/output/html/theme.php
index 9e3f3a5789..508b02b725 100644
--- a/query-monitor/output/html/theme.php
+++ b/query-monitor/output/html/theme.php
@@ -48,32 +48,36 @@ public function output() {
 		echo '<h3>' . esc_html__( 'Theme', 'query-monitor' ) . '</h3>';
 		echo '<p>' . esc_html( $data->stylesheet ) . '</p>';
 
-		echo '<p>';
-		// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-		echo self::output_filename( 'style.css', sprintf( '%s/style.css', $data->theme_dirs[ $data->stylesheet ] ), 0, true );
-		echo '</p>';
-
-		if ( $data->stylesheet_theme_json ) {
+		if ( self::has_clickable_links() ) {
 			echo '<p>';
 			// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-			echo self::output_filename( 'theme.json', $data->stylesheet_theme_json, 0, true );
+			echo self::output_filename( 'style.css', sprintf( '%s/style.css', $data->theme_dirs[ $data->stylesheet ] ), 0, true );
 			echo '</p>';
+
+			if ( $data->stylesheet_theme_json ) {
+				echo '<p>';
+				// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+				echo self::output_filename( 'theme.json', $data->stylesheet_theme_json, 0, true );
+				echo '</p>';
+			}
 		}
 
 		if ( $data->is_child_theme ) {
 			echo '<h3>' . esc_html__( 'Parent Theme', 'query-monitor' ) . '</h3>';
 			echo '<p>' . esc_html( $data->template ) . '</p>';
 
-			echo '<p>';
-			// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-			echo self::output_filename( 'style.css', sprintf( '%s/style.css', $data->theme_dirs[ $data->template ] ), 0, true );
-			echo '</p>';
-
-			if ( $data->template_theme_json ) {
+			if ( self::has_clickable_links() ) {
 				echo '<p>';
 				// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-				echo self::output_filename( 'theme.json', $data->template_theme_json, 0, true );
+				echo self::output_filename( 'style.css', sprintf( '%s/style.css', $data->theme_dirs[ $data->template ] ), 0, true );
 				echo '</p>';
+
+				if ( $data->template_theme_json ) {
+					echo '<p>';
+					// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+					echo self::output_filename( 'theme.json', $data->template_theme_json, 0, true );
+					echo '</p>';
+				}
 			}
 		}
 
diff --git a/query-monitor/output/raw/db_queries.php b/query-monitor/output/raw/db_queries.php
index 621bc78644..e8cd1b6f33 100644
--- a/query-monitor/output/raw/db_queries.php
+++ b/query-monitor/output/raw/db_queries.php
@@ -28,33 +28,17 @@ public function name() {
 
 	/**
 	 * @return array<string, mixed>
-	 * @phpstan-return array{
-	 *   total: int,
-	 *   time: float,
-	 *   queries: mixed[],
-	 *   errors?: array{
-	 *     total: int,
-	 *     errors: array<int, array<string, mixed>>,
-	 *   },
-	 *   dupes?: array{
-	 *     total: int,
-	 *     queries: array<string, int[]>,
-	 *   },
-	 * }|array{}
 	 */
 	public function get_output() {
+		$output = array();
 		/** @var QM_Data_DB_Queries $data */
 		$data = $this->collector->get_data();
 
-		if ( empty( $data->rows ) ) {
-			return array();
+		if ( empty( $data->wpdb ) ) {
+			return $output;
 		}
 
-		$output = array(
-			'total' => $data->total_qs,
-			'time' => round( $data->total_time, 4 ),
-			'queries' => array_map( array( $this, 'output_query_row' ), $data->rows ),
-		);
+		$output['wpdb'] = $this->output_queries( $data->wpdb );
 
 		if ( ! empty( $data->errors ) ) {
 			$output['errors'] = array(
@@ -81,6 +65,35 @@ public function get_output() {
 		return $output;
 	}
 
+	/**
+	 * @param stdClass $db
+	 * @return array
+	 * @phpstan-return array{
+	 *   total: int,
+	 *   time: float,
+	 *   queries: mixed[],
+	 * }|array{}
+	 */
+	protected function output_queries( stdClass $db ) {
+		$this->query_row = 0;
+
+		$output = array();
+
+		if ( empty( $db->rows ) ) {
+			return $output;
+		}
+
+		foreach ( $db->rows as $row ) {
+			$output[] = $this->output_query_row( $row );
+		}
+
+		return array(
+			'total' => $db->total_qs,
+			'time' => round( $db->total_time, 4 ),
+			'queries' => $output,
+		);
+	}
+
 	/**
 	 * @param array<string, mixed> $row
 	 * @return array<string, mixed>
diff --git a/query-monitor/query-monitor.php b/query-monitor/query-monitor.php
index 6e325de8d3..80f0004402 100644
--- a/query-monitor/query-monitor.php
+++ b/query-monitor/query-monitor.php
@@ -10,13 +10,13 @@
  *
  * Plugin Name:  Query Monitor
  * Description:  The developer tools panel for WordPress.
- * Version:      3.15.0
+ * Version:      3.12.1
  * Plugin URI:   https://querymonitor.com/
  * Author:       John Blackbourn
  * Author URI:   https://querymonitor.com/
  * Text Domain:  query-monitor
  * Domain Path:  /languages/
- * Requires PHP: 7.4
+ * Requires PHP: 7.2
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@
 	exit;
 }
 
-define( 'QM_VERSION', '3.15.0' );
+define( 'QM_VERSION', '3.12.1' );
 
 $qm_dir = dirname( __FILE__ );
 
@@ -77,17 +77,6 @@
 	return;
 }
 
-# Don't load QM during plugin updates to prevent function signature changes causing issues between versions.
-if ( is_admin() ) {
-	if ( isset( $_GET['action'] ) && 'upgrade-plugin' === $_GET['action'] ) {
-		return;
-	}
-
-	if ( isset( $_POST['action'] ) && 'update-plugin' === $_POST['action'] ) {
-		return;
-	}
-}
-
 unset( $qm_dir );
 
 QueryMonitor::init( __FILE__ )->set_up();
diff --git a/query-monitor/readme.txt b/query-monitor/readme.txt
index aa8598ea77..ac1395ef2b 100644
--- a/query-monitor/readme.txt
+++ b/query-monitor/readme.txt
@@ -1,11 +1,11 @@
 # Query Monitor
 Contributors: johnbillion
 Tags: debug, debug-bar, development, performance, query monitor, rest-api
-Requires at least: 5.6
-Tested up to: 6.4
-Stable tag: 3.15.0
+Requires at least: 5.2
+Tested up to: 6.2
+Stable tag: 3.12.1
 License: GPLv2 or later
-Requires PHP: 7.4
+Requires PHP: 7.2
 Donate link: https://github.com/sponsors/johnbillion
 
 Query Monitor is the developer tools panel for WordPress.
@@ -18,8 +18,6 @@ It includes some advanced features such as debugging of Ajax calls, REST API cal
 
 Query Monitor focuses heavily on presenting its information in a useful manner, for example by showing aggregate database queries grouped by the plugins, themes, or functions that are responsible for them. It adds an admin toolbar menu showing an overview of the current page, with complete debugging information shown in panels once you select a menu item.
 
-Query Monitor supports versions of WordPress up to three years old, and PHP version 7.4 or higher.
-
 For complete information, please see [the Query Monitor website](https://querymonitor.com/).
 
 Here's an overview of what's shown for each page load:
@@ -27,7 +25,6 @@ Here's an overview of what's shown for each page load:
 * Database queries, including notifications for slow, duplicate, or erroneous queries. Allows filtering by query type (`SELECT`, `UPDATE`, `DELETE`, etc), responsible component (plugin, theme, WordPress core), and calling function, and provides separate aggregate views for each.
 * The template filename, the complete template hierarchy, and names of all template parts that were loaded or not loaded (for block themes and classic themes).
 * PHP errors presented nicely along with their responsible component and call stack, and a visible warning in the admin toolbar.
-* Usage of "Doing it Wrong" or "Deprecated" functionality in the code on your site.
 * Blocks and associated properties within post content and within full site editing (FSE).
 * Matched rewrite rules, associated query strings, and query vars.
 * Enqueued scripts and stylesheets, along with their dependencies, dependents, and alerts for broken dependencies.
@@ -37,7 +34,6 @@ Here's an overview of what's shown for each page load:
 * Environment information, including detailed information about PHP, the database, WordPress, and the web server.
 * The values of all WordPress conditional functions such as `is_single()`, `is_home()`, etc.
 * Transients that were updated.
-* Usage of `switch_to_blog()` and `restore_current_blog()` on Multisite installations.
 
 In addition:
 
@@ -124,9 +120,11 @@ Please use [the issue tracker on Query Monitor's GitHub repo](https://github.com
 
 Yes, the [Altis Developer Tools](https://www.altis-dxp.com/resources/developer-docs/dev-tools/) are built on top of Query Monitor.
 
-### Is Query Monitor available on WordPress VIP?
+### Is Query Monitor available on WordPress.com VIP Go?
+
+Yes, it's included as part of the VIP Go platform. However, a user needs to be granted the `view_query_monitor` capability to see Query Monitor even if they're an administrator.
 
-Yes, but a user needs to be granted the `view_query_monitor` capability to see Query Monitor even if they're an administrator. [See the WordPress VIP documentation for more details](https://docs.wpvip.com/how-tos/enable-query-monitor/).
+Please note that information about database queries and the environment is somewhat restricted on VIP. This is a platform restriction and not a Query Monitor issue.
 
 ### I'm using multiple instances of `wpdb`. How do I get my additional instances to show up in Query Monitor?
 
@@ -142,240 +140,4 @@ Yes. You can enable this on the Settings panel.
 
 In addition, if you like the plugin then I'd love for you to [leave a review](https://wordpress.org/support/view/plugin-reviews/query-monitor). Tell all your friends about it too!
 
-## Changelog ##
-
-### 3.15.0 (10 November 2023) ###
-
-* Adds [a new assertion feature via the `qm/assert` action](https://querymonitor.com/wordpress-debugging/assertions/)
-* Confirms the plugin is tested up to WordPress 6.4
-
-
-### 3.14.1 (21 October 2023) ###
-
-* Improves compatibility with WordPress Playground
-
-### 3.14.0 (18 October 2023) ###
-
-* Corrects the port number handling when displaying URLs for scripts and styles
-* Improves the `db.php` handling when activating and deactivating Query Monitor on a single site within a Multisite network, and when `DISALLOW_FILE_MODS` is in use
-* Improves check for Debug Bar existence
-* Identifies drop-in plugins as a specific component instead of "other"
-* Simplifies some of the data structure used when logging queries
-* Specifies that Query Monitor supports WordPress versions up to three years old
-
-
-### 3.13.1 (15 July 2023) ###
-
-* Avoids a fatal error if a deprecated warning is triggered early on during the bootstrap process
-* Avoids a PHP warning that can be triggered during certain HTTP API requests when Curl is not in use
-* Skips loading QM during the plugin update process
-
-### 3.13.0 (9 July 2023) ###
-
-* Adds a dedicated panel for "Doing it Wrong" and deprecated functionality usage
-* Allows data in the HTTP API requests panel to be filtered by host name
-* Adds a "Type" column wherever a list of hooks can show both actions and filters
-* Improves various aspects of the "Editor" setting
-* Increases the minimum supported version of PHP to 7.4
-* Many thanks to @crstauf for the majority of the new features in this release
-
-### 3.12.3 (17 May 2023) ###
-
-* Improves theme template part data collection when the Gutenberg plugin is in use with a block theme
-* Skips attempting to resolve a block template if the theme doesn't support block templates
-* Removes the fallback to `$EZSQL_ERROR` for database query errors as it's not possible to determine if the error should be ignored
-
-### 3.12.2 (27 April 2023) ###
-
-* Adds the total count to the table footer of the PHP Errors panel
-* Improves the destination URL for links that point to the site editor
-* Implements some minor visual improvements
-* Removes unreliable information about the transport for HTTP API requests
-* Removes Query Monitor output from the interim login modal
-
-### 3.12.1 (24 March 2023) ###
-
-* Corrects some inter-panel links that point to the Queries panel and sub-panels
-* Switches to `sessionStorage` for the selected table column filters so they don't persist across tabs or sessions
-* Removes the "Debug Bar:" prefix on the menus for panels inherited from the Debug Bar plugin
-
-
-### 3.12.0 (16 March 2023) ###
-
-* Clarifies and improves information in the Template panel when a block theme or full site editing (FSE) is in use
-* Avoids PHP warnings if a third party plugin makes unexpected changes to language file paths
-* Implements some minor performance improvements
-* Removes misleading information about WordPress memory limits
-* Removes support for multiple instances of `wpdb` (see the FAQ for more information)
-
-### 3.11.2 (23 February 2023) ###
-
-* Implements various accessibility improvements
-* Fixes an issue where not all admin area footer scripts were shown in the Scripts panel
-* Improves output when the SQLite feature in the Performance Labs plugin is in use
-* Removes QM output altogether from the Customizer
-* Ensures `wp-content/db.php` from another plugin doesn't get removed when deactivating QM
-
-
-### 3.11.1 (3 January 2023) ###
-
-* Avoids a fatal error in PHP 8 when `posix_getpwuid()` or `posix_getgrgid()` doesn't return an expected value.
-
-### 3.11.0 (30 December 2022) ###
-
-* Adds a new "Multisite" panel that shows usage of `switch_to_blog()` and `restore_current_blog()` on Multisite installations
-* Improves the output shown for blocks and template parts when block themes or full site editing is in use
-* Introduces new `QM_Data` and `QM_Component` classes to make the data collection more structured and reliable
-* Increases the minimum supported version of PHP to 7.2
-* Improves the performance of SVG icons
-* Removes the ability to completely hide silenced PHP errors
-* Avoids some deprecated notices in PHP 8.2
-* Improves the performance of the PHP class autoloader
-
-### 3.10.1 (9 September 2022) ###
-
-* Prevents logging duplicate entries for multiple calls to load the same translation file
-* Brings the dispatcher priority back down to `9` for maximum compatibility with other plugins that use a shutdown handler
-
-
-### 3.10.0 (8 September 2022) ###
-
-* Adds information about the current language on the Languages panel
-* Reduces the chance that Query Monitor blames itself for PHP errors that don't have a stack trace
-* Replaces the use of Dashicons with inline SVGs and removes the `dashicons` dependency
-* Switches to class autoloading via Composer for reduced memory usage
-* Changes the priority of the `shutdown` dispatcher from `0` to `PHP_INT_MAX` to ensure as much data as possible is collected
-* Improves the styling of Debug Bar add-ons
-* Fixes some erroneous localisation of float values in REST API output
-* Bumps the minimum supported PHP version to 5.6
-* Improves various other bits and bobs
-
-### 3.9.0 (15 April 2022) ###
-
-* Introduces a dark mode toggle on the Settings panel, which replaces the `QM_DARK_MODE` constant
-* Prevents errors with undefined constants being reported in `db.php`
-* Adds more comprehensive handling of unexpected values in stack traces
-* Fixes PHP Warning 'Header may not contain NUL bytes' when outputting headers
-
-### 3.8.2 (7 January 2022) ###
-
-* Fixes some deprecated notices with PHP 8.1
-* Improves the handling of SQL queries that consist only of MySQL comments
-
-### 3.8.1 (2 January 2022) ###
-
-* Fixes an incompatibility with PHP versions prior to 7.2
-* Fixes a warning that was being triggered within the PHP header dispatcher
-* Introduces the `qm/component_type/{$type}` filter
-* Introduces a `QM_VERSION` constant
-
-### 3.8.0 (27 December 2021) ###
-
-* Introduces the ability for a third party to cease all further data collection and output at any point by calling `do_action( 'qm/cease' )`, for example to prevent memory exhaustion during long-running operations
-* Reduces the width of the admin toolbar menu item by using lower decimal precision
-* Improves the Template panel information when a block theme is in use (for Full Site Editing)
-* Improves the performance and accuracy of stack traces and calling function information
-* Corrects some formatting of numbers and error messages in the REST API output
-* Adds more useful information when a persistent object cache or opcode cache isn't in use
-* Improves clarity in the Scripts and Styles panels when any of the URLs include a port number
-* Introduces the `qm/component_context/{$type}` filter to complement `qm/component_name/{$type}` and `qm/component_dirs`
-* Improves internal code quality, internationalisation, and further reduces overall memory usage
-
-### 3.7.1 (13 May 2021) ###
-
-* Add a fallback for timing processing during Ajax requests that are dispatched before the `shutdown` hook.
-
-### 3.7.0 (13 May 2021) ###
-
-* <a href="https://querymonitor.com/blog/2021/05/debugging-wordpress-rest-api-requests/">Introduce debugging output in a `qm` property in enveloped REST API responses</a>
-* Add HTTP API call information to the overview panel
-* Don't show QM output inside WordPress embeds as nobody uses this
-* Don't try to access the `QM_HIDE_SELF` constant before it's defined
-* Process the timing and memory related stats as early as possible so the data isn't too skewed
-
-
-### 3.6.8 (9 May 2021) ###
-
-* Add WordPress memory usage statistic to Overview panel
-* Add block context information to the Blocks panel
-* Fix row highlighting of TH cells
-* Fix some panel resizing bugs
-
-
-### 3.6.7 (20 January 2021) ###
-
-* Implement a `QM_DB_SYMLINK` constant to prevent the `db.php` symlink being put into place.
-* Remove a dependency on `SAVEQUERIES` in the query collector.
-* Remove invalid `scope` attributes on table cells.
-
-
-### 3.6.6 (13 January 2021) ###
-
-* PHP 8 fix.
-* Improve the display for various empty values when logging.
-* Don't display child menus until the parent menu is active. Makes the menu clearer.
-* Detect local host names in HTTP API requests and don't mark them as ignoring certificate verification.
-* Prevent the text in toggle buttons from being selected when selecting data in tables.
-* Remove support for the Dark Mode plugin which isn't Dark Mode any more.
-
-
-### 3.6.5 (13 November 2020) ###
-
-* Always show the Logs panel, with a link to help docs.
-* Whole bunch of improvements to QM's "broken" state handling.
-* Remove usage of deprecated jQuery methods.
-* Add support for Altis dependencies as components.
-* Add `innodb_buffer_pool_size` variable to the mysql environment list.
-* Preformat the Logger output
-* Fix the PHP version check.
-
-
-### 3.6.4 (20 August 2020) ###
-
-* Correct an error introduced in 3.6.2 with the extra early error handling (ironic).
-
-### 3.6.3 (20 August 2020) ###
-
-* Correct the size of the close icon.
-
-### 3.6.2 (20 August 2020) ###
-
-  * Capture and display the most recent PHP error that occurred before QM loaded.
-  * Add support for the environment type added in WP 5.5.
-  * Avoid a potentially blank translation for some plural forms.
-  * Increase some contrast in dark mode.
-  * Combine the response-related sections of the Request panel.
-  * Add extra sanity checking when attempting to fetch the posix user information.
-
-### 3.6.1 (25 July 2020) ###
-
-* Adjust the bottom margin when the QM panel is open so QM doesn't cover the bottom of the page. Works more often than not.
-* Prevent QM from triggering a fatal itself if a fatal occurs before the HTML dispatcher is loaded.
-* Add an informational message to the template output when template hooks are in use.
-* Fix errors caused by missing user or group IDs when collecting environment data.
-* Add TextMate to list of supported editors.
-* Demote some cache warnings to informational messages.
-* Support passing backtrace to `QM_Backtrace`.
-
-
-### 3.6.0 (8 May 2020) ###
-
-* Improvements to the UI when a fatal error occurs, including an admin toolbar warning.
-* Improvements to the UI when QM is running in "broken" mode due to missing jQuery or an unrecoverable JavaScript error.
-* Don't display fatal errors if error display is off and the user cannot view QM.
-* Improvements to the visual appearance of the `wp_die()` output.
-* Simplify re-throwing a caught exception so QM doesn't get the blame for fatal errors, eg. in the WordPress core fatal error handler.
-* Add support for logging a variable of any type in the logger, as a replacement for var dumping.
-* Don't show a message for errors in Ajax calls that have already occurred on the main page load.
-* Don't dispatch QM during an iframed request, eg the plugin info modal or an upgrader action.
-* Hide QM itself from various panels by default to remove noise. Can be controlled via the existing `QM_HIDE_SELF` configuration constant.
-* Support for the new `is_favicon()` conditional added in WP 5.4.
-* Fix the side panel resizing functionality.
-* Add a WP-CLI command for creating the symlink to the db file.
-* Add filters to `QM_Util::get_file_dirs()` and `get_file_component()` to allow support for non-standard plugin and theme locations.
-* Add an action that fires when QM enqueues its assets, so add-on plugins can enqueue theirs only when necessary.
-
-
-### 3.5.2 (2 December 2019) ###
-
-* Add support for exposing [Full Site Editing](https://github.com/WordPress/gutenberg/issues?q=label%3A%22%5BFeature%5D+Full+Site+Editing%22) blocks in the Block Editor panel.
+<!-- changelog -->
diff --git a/query-monitor/vendor/autoload.php b/query-monitor/vendor/autoload.php
index 1d4019b09e..d906ff5de1 100644
--- a/query-monitor/vendor/autoload.php
+++ b/query-monitor/vendor/autoload.php
@@ -22,4 +22,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit9bc748a33ab984c092a749a74d7b8261::getLoader();
+return ComposerAutoloaderInitfaf42c5f235c65e8397793ae676be6da::getLoader();
diff --git a/query-monitor/vendor/composer/ClassLoader.php b/query-monitor/vendor/composer/ClassLoader.php
index 7824d8f7ea..a72151c77c 100644
--- a/query-monitor/vendor/composer/ClassLoader.php
+++ b/query-monitor/vendor/composer/ClassLoader.php
@@ -45,34 +45,35 @@ class ClassLoader
     /** @var \Closure(string):void */
     private static $includeFile;
 
-    /** @var string|null */
+    /** @var ?string */
     private $vendorDir;
 
     // PSR-4
     /**
-     * @var array<string, array<string, int>>
+     * @var array[]
+     * @psalm-var array<string, array<string, int>>
      */
     private $prefixLengthsPsr4 = array();
     /**
-     * @var array<string, list<string>>
+     * @var array[]
+     * @psalm-var array<string, array<int, string>>
      */
     private $prefixDirsPsr4 = array();
     /**
-     * @var list<string>
+     * @var array[]
+     * @psalm-var array<string, string>
      */
     private $fallbackDirsPsr4 = array();
 
     // PSR-0
     /**
-     * List of PSR-0 prefixes
-     *
-     * Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2')))
-     *
-     * @var array<string, array<string, list<string>>>
+     * @var array[]
+     * @psalm-var array<string, array<string, string[]>>
      */
     private $prefixesPsr0 = array();
     /**
-     * @var list<string>
+     * @var array[]
+     * @psalm-var array<string, string>
      */
     private $fallbackDirsPsr0 = array();
 
@@ -80,7 +81,8 @@ class ClassLoader
     private $useIncludePath = false;
 
     /**
-     * @var array<string, string>
+     * @var string[]
+     * @psalm-var array<string, string>
      */
     private $classMap = array();
 
@@ -88,20 +90,21 @@ class ClassLoader
     private $classMapAuthoritative = false;
 
     /**
-     * @var array<string, bool>
+     * @var bool[]
+     * @psalm-var array<string, bool>
      */
     private $missingClasses = array();
 
-    /** @var string|null */
+    /** @var ?string */
     private $apcuPrefix;
 
     /**
-     * @var array<string, self>
+     * @var self[]
      */
     private static $registeredLoaders = array();
 
     /**
-     * @param string|null $vendorDir
+     * @param ?string $vendorDir
      */
     public function __construct($vendorDir = null)
     {
@@ -110,7 +113,7 @@ public function __construct($vendorDir = null)
     }
 
     /**
-     * @return array<string, list<string>>
+     * @return string[]
      */
     public function getPrefixes()
     {
@@ -122,7 +125,8 @@ public function getPrefixes()
     }
 
     /**
-     * @return array<string, list<string>>
+     * @return array[]
+     * @psalm-return array<string, array<int, string>>
      */
     public function getPrefixesPsr4()
     {
@@ -130,7 +134,8 @@ public function getPrefixesPsr4()
     }
 
     /**
-     * @return list<string>
+     * @return array[]
+     * @psalm-return array<string, string>
      */
     public function getFallbackDirs()
     {
@@ -138,7 +143,8 @@ public function getFallbackDirs()
     }
 
     /**
-     * @return list<string>
+     * @return array[]
+     * @psalm-return array<string, string>
      */
     public function getFallbackDirsPsr4()
     {
@@ -146,7 +152,8 @@ public function getFallbackDirsPsr4()
     }
 
     /**
-     * @return array<string, string> Array of classname => path
+     * @return string[] Array of classname => path
+     * @psalm-return array<string, string>
      */
     public function getClassMap()
     {
@@ -154,7 +161,8 @@ public function getClassMap()
     }
 
     /**
-     * @param array<string, string> $classMap Class to filename map
+     * @param string[] $classMap Class to filename map
+     * @psalm-param array<string, string> $classMap
      *
      * @return void
      */
@@ -171,25 +179,24 @@ public function addClassMap(array $classMap)
      * Registers a set of PSR-0 directories for a given prefix, either
      * appending or prepending to the ones previously set for this prefix.
      *
-     * @param string              $prefix  The prefix
-     * @param list<string>|string $paths   The PSR-0 root directories
-     * @param bool                $prepend Whether to prepend the directories
+     * @param string          $prefix  The prefix
+     * @param string[]|string $paths   The PSR-0 root directories
+     * @param bool            $prepend Whether to prepend the directories
      *
      * @return void
      */
     public function add($prefix, $paths, $prepend = false)
     {
-        $paths = (array) $paths;
         if (!$prefix) {
             if ($prepend) {
                 $this->fallbackDirsPsr0 = array_merge(
-                    $paths,
+                    (array) $paths,
                     $this->fallbackDirsPsr0
                 );
             } else {
                 $this->fallbackDirsPsr0 = array_merge(
                     $this->fallbackDirsPsr0,
-                    $paths
+                    (array) $paths
                 );
             }
 
@@ -198,19 +205,19 @@ public function add($prefix, $paths, $prepend = false)
 
         $first = $prefix[0];
         if (!isset($this->prefixesPsr0[$first][$prefix])) {
-            $this->prefixesPsr0[$first][$prefix] = $paths;
+            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
 
             return;
         }
         if ($prepend) {
             $this->prefixesPsr0[$first][$prefix] = array_merge(
-                $paths,
+                (array) $paths,
                 $this->prefixesPsr0[$first][$prefix]
             );
         } else {
             $this->prefixesPsr0[$first][$prefix] = array_merge(
                 $this->prefixesPsr0[$first][$prefix],
-                $paths
+                (array) $paths
             );
         }
     }
@@ -219,9 +226,9 @@ public function add($prefix, $paths, $prepend = false)
      * Registers a set of PSR-4 directories for a given namespace, either
      * appending or prepending to the ones previously set for this namespace.
      *
-     * @param string              $prefix  The prefix/namespace, with trailing '\\'
-     * @param list<string>|string $paths   The PSR-4 base directories
-     * @param bool                $prepend Whether to prepend the directories
+     * @param string          $prefix  The prefix/namespace, with trailing '\\'
+     * @param string[]|string $paths   The PSR-4 base directories
+     * @param bool            $prepend Whether to prepend the directories
      *
      * @throws \InvalidArgumentException
      *
@@ -229,18 +236,17 @@ public function add($prefix, $paths, $prepend = false)
      */
     public function addPsr4($prefix, $paths, $prepend = false)
     {
-        $paths = (array) $paths;
         if (!$prefix) {
             // Register directories for the root namespace.
             if ($prepend) {
                 $this->fallbackDirsPsr4 = array_merge(
-                    $paths,
+                    (array) $paths,
                     $this->fallbackDirsPsr4
                 );
             } else {
                 $this->fallbackDirsPsr4 = array_merge(
                     $this->fallbackDirsPsr4,
-                    $paths
+                    (array) $paths
                 );
             }
         } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
@@ -250,18 +256,18 @@ public function addPsr4($prefix, $paths, $prepend = false)
                 throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
             }
             $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = $paths;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
         } elseif ($prepend) {
             // Prepend directories for an already registered namespace.
             $this->prefixDirsPsr4[$prefix] = array_merge(
-                $paths,
+                (array) $paths,
                 $this->prefixDirsPsr4[$prefix]
             );
         } else {
             // Append directories for an already registered namespace.
             $this->prefixDirsPsr4[$prefix] = array_merge(
                 $this->prefixDirsPsr4[$prefix],
-                $paths
+                (array) $paths
             );
         }
     }
@@ -270,8 +276,8 @@ public function addPsr4($prefix, $paths, $prepend = false)
      * Registers a set of PSR-0 directories for a given prefix,
      * replacing any others previously set for this prefix.
      *
-     * @param string              $prefix The prefix
-     * @param list<string>|string $paths  The PSR-0 base directories
+     * @param string          $prefix The prefix
+     * @param string[]|string $paths  The PSR-0 base directories
      *
      * @return void
      */
@@ -288,8 +294,8 @@ public function set($prefix, $paths)
      * Registers a set of PSR-4 directories for a given namespace,
      * replacing any others previously set for this namespace.
      *
-     * @param string              $prefix The prefix/namespace, with trailing '\\'
-     * @param list<string>|string $paths  The PSR-4 base directories
+     * @param string          $prefix The prefix/namespace, with trailing '\\'
+     * @param string[]|string $paths  The PSR-4 base directories
      *
      * @throws \InvalidArgumentException
      *
@@ -475,9 +481,9 @@ public function findFile($class)
     }
 
     /**
-     * Returns the currently registered loaders keyed by their corresponding vendor directories.
+     * Returns the currently registered loaders indexed by their corresponding vendor directories.
      *
-     * @return array<string, self>
+     * @return self[]
      */
     public static function getRegisteredLoaders()
     {
diff --git a/query-monitor/vendor/composer/autoload_classmap.php b/query-monitor/vendor/composer/autoload_classmap.php
new file mode 100644
index 0000000000..fbe1e55337
--- /dev/null
+++ b/query-monitor/vendor/composer/autoload_classmap.php
@@ -0,0 +1,92 @@
+<?php
+
+// autoload_classmap.php @generated by Composer
+
+$vendorDir = dirname(__DIR__);
+$baseDir = dirname($vendorDir);
+
+return array(
+    'Debug_Bar' => $baseDir . '/classes/debug_bar.php',
+    'Debug_Bar_Panel' => $baseDir . '/classes/debug_bar_panel.php',
+    'QM' => $baseDir . '/classes/QM.php',
+    'QM_Activation' => $baseDir . '/classes/Activation.php',
+    'QM_Backtrace' => $baseDir . '/classes/Backtrace.php',
+    'QM_CLI' => $baseDir . '/classes/CLI.php',
+    'QM_Collector' => $baseDir . '/classes/Collector.php',
+    'QM_Collectors' => $baseDir . '/classes/Collectors.php',
+    'QM_Component' => $baseDir . '/classes/Component.php',
+    'QM_DB' => $baseDir . '/classes/DB.php',
+    'QM_Data' => $baseDir . '/classes/Data.php',
+    'QM_DataCollector' => $baseDir . '/classes/DataCollector.php',
+    'QM_Data_Admin' => $baseDir . '/data/admin.php',
+    'QM_Data_Assets' => $baseDir . '/data/assets.php',
+    'QM_Data_Block_Editor' => $baseDir . '/data/block_editor.php',
+    'QM_Data_Cache' => $baseDir . '/data/cache.php',
+    'QM_Data_Caps' => $baseDir . '/data/caps.php',
+    'QM_Data_Conditionals' => $baseDir . '/data/conditionals.php',
+    'QM_Data_DB_Callers' => $baseDir . '/data/db_callers.php',
+    'QM_Data_DB_Components' => $baseDir . '/data/db_components.php',
+    'QM_Data_DB_Dupes' => $baseDir . '/data/db_dupes.php',
+    'QM_Data_DB_Queries' => $baseDir . '/data/db_queries.php',
+    'QM_Data_Environment' => $baseDir . '/data/environment.php',
+    'QM_Data_Fallback' => $baseDir . '/data/fallback.php',
+    'QM_Data_HTTP' => $baseDir . '/data/http.php',
+    'QM_Data_Hooks' => $baseDir . '/data/hooks.php',
+    'QM_Data_Languages' => $baseDir . '/data/languages.php',
+    'QM_Data_Logger' => $baseDir . '/data/logger.php',
+    'QM_Data_Multisite' => $baseDir . '/data/multisite.php',
+    'QM_Data_Overview' => $baseDir . '/data/overview.php',
+    'QM_Data_PHP_Errors' => $baseDir . '/data/php_errors.php',
+    'QM_Data_Raw_Request' => $baseDir . '/data/raw_request.php',
+    'QM_Data_Redirect' => $baseDir . '/data/redirect.php',
+    'QM_Data_Request' => $baseDir . '/data/request.php',
+    'QM_Data_Theme' => $baseDir . '/data/theme.php',
+    'QM_Data_Timing' => $baseDir . '/data/timing.php',
+    'QM_Data_Transients' => $baseDir . '/data/transients.php',
+    'QM_Dispatcher' => $baseDir . '/classes/Dispatcher.php',
+    'QM_Dispatchers' => $baseDir . '/classes/Dispatchers.php',
+    'QM_Hook' => $baseDir . '/classes/Hook.php',
+    'QM_Output' => $baseDir . '/classes/Output.php',
+    'QM_Output_Headers' => $baseDir . '/output/Headers.php',
+    'QM_Output_Headers_Overview' => $baseDir . '/output/headers/overview.php',
+    'QM_Output_Headers_PHP_Errors' => $baseDir . '/output/headers/php_errors.php',
+    'QM_Output_Headers_Redirects' => $baseDir . '/output/headers/redirects.php',
+    'QM_Output_Html' => $baseDir . '/output/Html.php',
+    'QM_Output_Html_Admin' => $baseDir . '/output/html/admin.php',
+    'QM_Output_Html_Assets' => $baseDir . '/output/html/assets.php',
+    'QM_Output_Html_Assets_Scripts' => $baseDir . '/output/html/assets_scripts.php',
+    'QM_Output_Html_Assets_Styles' => $baseDir . '/output/html/assets_styles.php',
+    'QM_Output_Html_Block_Editor' => $baseDir . '/output/html/block_editor.php',
+    'QM_Output_Html_Caps' => $baseDir . '/output/html/caps.php',
+    'QM_Output_Html_Conditionals' => $baseDir . '/output/html/conditionals.php',
+    'QM_Output_Html_DB_Callers' => $baseDir . '/output/html/db_callers.php',
+    'QM_Output_Html_DB_Components' => $baseDir . '/output/html/db_components.php',
+    'QM_Output_Html_DB_Dupes' => $baseDir . '/output/html/db_dupes.php',
+    'QM_Output_Html_DB_Queries' => $baseDir . '/output/html/db_queries.php',
+    'QM_Output_Html_Debug_Bar' => $baseDir . '/output/html/debug_bar.php',
+    'QM_Output_Html_Environment' => $baseDir . '/output/html/environment.php',
+    'QM_Output_Html_HTTP' => $baseDir . '/output/html/http.php',
+    'QM_Output_Html_Headers' => $baseDir . '/output/html/headers.php',
+    'QM_Output_Html_Hooks' => $baseDir . '/output/html/hooks.php',
+    'QM_Output_Html_Languages' => $baseDir . '/output/html/languages.php',
+    'QM_Output_Html_Logger' => $baseDir . '/output/html/logger.php',
+    'QM_Output_Html_Multisite' => $baseDir . '/output/html/multisite.php',
+    'QM_Output_Html_Overview' => $baseDir . '/output/html/overview.php',
+    'QM_Output_Html_PHP_Errors' => $baseDir . '/output/html/php_errors.php',
+    'QM_Output_Html_Request' => $baseDir . '/output/html/request.php',
+    'QM_Output_Html_Theme' => $baseDir . '/output/html/theme.php',
+    'QM_Output_Html_Timing' => $baseDir . '/output/html/timing.php',
+    'QM_Output_Html_Transients' => $baseDir . '/output/html/transients.php',
+    'QM_Output_Raw' => $baseDir . '/output/Raw.php',
+    'QM_Output_Raw_Cache' => $baseDir . '/output/raw/cache.php',
+    'QM_Output_Raw_Conditionals' => $baseDir . '/output/raw/conditionals.php',
+    'QM_Output_Raw_DB_Queries' => $baseDir . '/output/raw/db_queries.php',
+    'QM_Output_Raw_HTTP' => $baseDir . '/output/raw/http.php',
+    'QM_Output_Raw_Logger' => $baseDir . '/output/raw/logger.php',
+    'QM_Output_Raw_Transients' => $baseDir . '/output/raw/transients.php',
+    'QM_PHP' => $baseDir . '/classes/PHP.php',
+    'QM_Plugin' => $baseDir . '/classes/Plugin.php',
+    'QM_Timer' => $baseDir . '/classes/Timer.php',
+    'QM_Util' => $baseDir . '/classes/Util.php',
+    'QueryMonitor' => $baseDir . '/classes/QueryMonitor.php',
+);
diff --git a/query-monitor/vendor/composer/autoload_namespaces.php b/query-monitor/vendor/composer/autoload_namespaces.php
new file mode 100644
index 0000000000..15a2ff3ad6
--- /dev/null
+++ b/query-monitor/vendor/composer/autoload_namespaces.php
@@ -0,0 +1,9 @@
+<?php
+
+// autoload_namespaces.php @generated by Composer
+
+$vendorDir = dirname(__DIR__);
+$baseDir = dirname($vendorDir);
+
+return array(
+);
diff --git a/query-monitor/vendor/composer/autoload_psr4.php b/query-monitor/vendor/composer/autoload_psr4.php
new file mode 100644
index 0000000000..3890ddc240
--- /dev/null
+++ b/query-monitor/vendor/composer/autoload_psr4.php
@@ -0,0 +1,9 @@
+<?php
+
+// autoload_psr4.php @generated by Composer
+
+$vendorDir = dirname(__DIR__);
+$baseDir = dirname($vendorDir);
+
+return array(
+);
diff --git a/query-monitor/vendor/composer/autoload_real.php b/query-monitor/vendor/composer/autoload_real.php
index 4c133f55c4..b18601c80c 100644
--- a/query-monitor/vendor/composer/autoload_real.php
+++ b/query-monitor/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit9bc748a33ab984c092a749a74d7b8261
+class ComposerAutoloaderInitfaf42c5f235c65e8397793ae676be6da
 {
     private static $loader;
 
@@ -24,12 +24,12 @@ public static function getLoader()
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit9bc748a33ab984c092a749a74d7b8261', 'loadClassLoader'), true, false);
+        spl_autoload_register(array('ComposerAutoloaderInitfaf42c5f235c65e8397793ae676be6da', 'loadClassLoader'), true, false);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit9bc748a33ab984c092a749a74d7b8261', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitfaf42c5f235c65e8397793ae676be6da', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit9bc748a33ab984c092a749a74d7b8261::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInitfaf42c5f235c65e8397793ae676be6da::getInitializer($loader));
 
         if (method_exists($loader,"setClassMapAuthoritative")){
             $loader->setClassMapAuthoritative(true);
diff --git a/query-monitor/vendor/composer/autoload_static.php b/query-monitor/vendor/composer/autoload_static.php
index 62cbeba3ec..e6cfecd708 100644
--- a/query-monitor/vendor/composer/autoload_static.php
+++ b/query-monitor/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit9bc748a33ab984c092a749a74d7b8261
+class ComposerStaticInitfaf42c5f235c65e8397793ae676be6da
 {
     public static $classMap = array (
         'Debug_Bar' => __DIR__ . '/../..' . '/classes/debug_bar.php',
@@ -14,7 +14,6 @@ class ComposerStaticInit9bc748a33ab984c092a749a74d7b8261
         'QM_Backtrace' => __DIR__ . '/../..' . '/classes/Backtrace.php',
         'QM_CLI' => __DIR__ . '/../..' . '/classes/CLI.php',
         'QM_Collector' => __DIR__ . '/../..' . '/classes/Collector.php',
-        'QM_Collector_Assets' => __DIR__ . '/../..' . '/classes/Collector_Assets.php',
         'QM_Collectors' => __DIR__ . '/../..' . '/classes/Collectors.php',
         'QM_Component' => __DIR__ . '/../..' . '/classes/Component.php',
         'QM_DB' => __DIR__ . '/../..' . '/classes/DB.php',
@@ -30,7 +29,6 @@ class ComposerStaticInit9bc748a33ab984c092a749a74d7b8261
         'QM_Data_DB_Components' => __DIR__ . '/../..' . '/data/db_components.php',
         'QM_Data_DB_Dupes' => __DIR__ . '/../..' . '/data/db_dupes.php',
         'QM_Data_DB_Queries' => __DIR__ . '/../..' . '/data/db_queries.php',
-        'QM_Data_Doing_It_Wrong' => __DIR__ . '/../..' . '/data/doing_it_wrong.php',
         'QM_Data_Environment' => __DIR__ . '/../..' . '/data/environment.php',
         'QM_Data_Fallback' => __DIR__ . '/../..' . '/data/fallback.php',
         'QM_Data_HTTP' => __DIR__ . '/../..' . '/data/http.php',
@@ -67,7 +65,6 @@ class ComposerStaticInit9bc748a33ab984c092a749a74d7b8261
         'QM_Output_Html_DB_Dupes' => __DIR__ . '/../..' . '/output/html/db_dupes.php',
         'QM_Output_Html_DB_Queries' => __DIR__ . '/../..' . '/output/html/db_queries.php',
         'QM_Output_Html_Debug_Bar' => __DIR__ . '/../..' . '/output/html/debug_bar.php',
-        'QM_Output_Html_Doing_It_Wrong' => __DIR__ . '/../..' . '/output/html/doing_it_wrong.php',
         'QM_Output_Html_Environment' => __DIR__ . '/../..' . '/output/html/environment.php',
         'QM_Output_Html_HTTP' => __DIR__ . '/../..' . '/output/html/http.php',
         'QM_Output_Html_Headers' => __DIR__ . '/../..' . '/output/html/headers.php',
@@ -98,7 +95,7 @@ class ComposerStaticInit9bc748a33ab984c092a749a74d7b8261
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->classMap = ComposerStaticInit9bc748a33ab984c092a749a74d7b8261::$classMap;
+            $loader->classMap = ComposerStaticInitfaf42c5f235c65e8397793ae676be6da::$classMap;
 
         }, null, ClassLoader::class);
     }
diff --git a/query-monitor/vendor/composer/installed.json b/query-monitor/vendor/composer/installed.json
new file mode 100644
index 0000000000..f20a6c47c6
--- /dev/null
+++ b/query-monitor/vendor/composer/installed.json
@@ -0,0 +1,5 @@
+{
+    "packages": [],
+    "dev": false,
+    "dev-package-names": []
+}
diff --git a/query-monitor/vendor/composer/installed.php b/query-monitor/vendor/composer/installed.php
new file mode 100644
index 0000000000..64205780c7
--- /dev/null
+++ b/query-monitor/vendor/composer/installed.php
@@ -0,0 +1,23 @@
+<?php return array(
+    'root' => array(
+        'name' => 'johnbillion/query-monitor',
+        'pretty_version' => 'dev-release',
+        'version' => 'dev-release',
+        'reference' => '10c40a3e8a9d62b091d235646ac0dc80892d2b6b',
+        'type' => 'wordpress-plugin',
+        'install_path' => __DIR__ . '/../../',
+        'aliases' => array(),
+        'dev' => false,
+    ),
+    'versions' => array(
+        'johnbillion/query-monitor' => array(
+            'pretty_version' => 'dev-release',
+            'version' => 'dev-release',
+            'reference' => '10c40a3e8a9d62b091d235646ac0dc80892d2b6b',
+            'type' => 'wordpress-plugin',
+            'install_path' => __DIR__ . '/../../',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+    ),
+);
diff --git a/query-monitor/vendor/composer/platform_check.php b/query-monitor/vendor/composer/platform_check.php
index 580fa96095..589e9e770b 100644
--- a/query-monitor/vendor/composer/platform_check.php
+++ b/query-monitor/vendor/composer/platform_check.php
@@ -4,8 +4,8 @@
 
 $issues = array();
 
-if (!(PHP_VERSION_ID >= 70400)) {
-    $issues[] = 'Your Composer dependencies require a PHP version ">= 7.4.0". You are running ' . PHP_VERSION . '.';
+if (!(PHP_VERSION_ID >= 70200)) {
+    $issues[] = 'Your Composer dependencies require a PHP version ">= 7.2.0". You are running ' . PHP_VERSION . '.';
 }
 
 if ($issues) {
diff --git a/query-monitor/wp-content/db.php b/query-monitor/wp-content/db.php
index 8363a46d75..2e272ec3cc 100644
--- a/query-monitor/wp-content/db.php
+++ b/query-monitor/wp-content/db.php
@@ -2,7 +2,7 @@
 /**
  * Plugin Name: Query Monitor Database Class (Drop-in)
  * Description: Database drop-in for Query Monitor, the developer tools panel for WordPress.
- * Version:     3.15.0
+ * Version:     3.12.1
  * Plugin URI:  https://querymonitor.com/
  * Author:      John Blackbourn
  * Author URI:  https://querymonitor.com/
@@ -46,17 +46,6 @@
 	return;
 }
 
-# Don't load QM during plugin updates to prevent function signature changes causing issues between versions.
-if ( is_admin() ) {
-	if ( isset( $_GET['action'] ) && 'upgrade-plugin' === $_GET['action'] ) {
-		return;
-	}
-
-	if ( isset( $_POST['action'] ) && 'update-plugin' === $_POST['action'] ) {
-		return;
-	}
-}
-
 // This must be required before vendor/autoload.php so QM can serve its own message about PHP compatibility.
 $qm_dir = dirname( dirname( __FILE__ ) );
 $qm_php = "{$qm_dir}/classes/PHP.php";