diff --git a/src/Bridges/DatabaseTracy/ConnectionPanel.php b/src/Bridges/DatabaseTracy/ConnectionPanel.php
index ba1729e8f..c92992bf8 100644
--- a/src/Bridges/DatabaseTracy/ConnectionPanel.php
+++ b/src/Bridges/DatabaseTracy/ConnectionPanel.php
@@ -10,6 +10,7 @@
 namespace Nette\Bridges\DatabaseTracy;
 
 use Nette;
+use Nette\Database\Connection;
 use Nette\Database\Helpers;
 use Tracy;
 
@@ -43,13 +44,13 @@ class ConnectionPanel implements Tracy\IBarPanel
 	private $queries = [];
 
 
-	public function __construct(Nette\Database\Connection $connection)
+	public function __construct(Connection $connection)
 	{
 		$connection->onQuery[] = [$this, 'logQuery'];
 	}
 
 
-	public function logQuery(Nette\Database\Connection $connection, $result): void
+	public function logQuery(Connection $connection, $result): void
 	{
 		if ($this->disabled) {
 			return;
@@ -59,13 +60,11 @@ public function logQuery(Nette\Database\Connection $connection, $result): void
 		$source = null;
 		$trace = $result instanceof \PDOException ? $result->getTrace() : debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
 		foreach ($trace as $row) {
-			if (isset($row['file']) && is_file($row['file']) && !Tracy\Debugger::getBluescreen()->isCollapsed($row['file'])) {
-				if (
-					(strpos($row['function'] ?? '', 'call_user_func') === 0)
-					|| (is_subclass_of($row['class'] ?? '', '\\Nette\\Database\\Connection'))
-				) {
-					continue;
-				}
+			if (
+				(isset($row['file']) && is_file($row['file']) && !Tracy\Debugger::getBluescreen()->isCollapsed($row['file']))
+				&& ($row['class'] ?? '') !== self::class
+				&& !is_a($row['class'] ?? '', Connection::class, true)
+			) {
 				$source = [$row['file'], (int) $row['line']];
 				break;
 			}
diff --git a/src/Bridges/DatabaseTracy/templates/ConnectionPanel.panel.phtml b/src/Bridges/DatabaseTracy/templates/ConnectionPanel.panel.phtml
index 046163d02..6b613f2b1 100644
--- a/src/Bridges/DatabaseTracy/templates/ConnectionPanel.panel.phtml
+++ b/src/Bridges/DatabaseTracy/templates/ConnectionPanel.panel.phtml
@@ -18,7 +18,7 @@ use Tracy;
 
 <div class="tracy-inner">
 <div class="tracy-inner-container">
-	<table>
+	<table class="table-sortable">
 		<tr><th>Time&nbsp;ms</th><th>SQL Query</th><th>Rows</th></tr>
 		<?php
 		foreach ($queries as $query):