diff --git a/ChangeLog b/ChangeLog
index 768ff53ff4..3d040c6f04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,6 +48,7 @@ phpMyAdmin - ChangeLog
 - issue #17420 Fix profiling chart not loading when profiling is activated
 - issue #18159 Fix error when changing the number of chart columns in the monitor page
 - issue #18403 Fix Uncaught SyntaxError: JSON.parse on makegrid conditions
+- issue #17528 Fix double escaping of database group names in the navigation tree
 
 5.2.1 (2023-02-07)
 - issue #17522 Fix case where the routes cache file is invalid
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index c6c0f6ed42..e843da7551 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1320,11 +1320,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Controllers/Import/ImportController.php
 
-		-
-			message: "#^Parameter \\#2 \\$size of method PhpMyAdmin\\\\Import\\:\\:getNextChunk\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: libraries/classes/Controllers/Import/ImportController.php
-
 		-
 			message: "#^Parameter \\#1 \\$dependencies of method PhpMyAdmin\\\\Normalization\\:\\:getHtmlForNewTables3NF\\(\\) expects object, mixed given\\.$#"
 			count: 1
@@ -7920,6 +7915,11 @@ parameters:
 			count: 1
 			path: libraries/classes/Setup/Index.php
 
+		-
+			message: "#^Binary operation \"\\+\" between int\\<min, \\-1\\>\\|int\\<1, max\\> and int\\|string results in an error\\.$#"
+			count: 1
+			path: libraries/classes/Sql.php
+
 		-
 			message: "#^Cannot access property \\$where on mixed\\.$#"
 			count: 1