diff --git a/database/pgsql/queries.go b/database/pgsql/queries.go
index f9373bb1..9cff94b8 100644
--- a/database/pgsql/queries.go
+++ b/database/pgsql/queries.go
@@ -205,16 +205,22 @@ const (
 		WHERE name = $1`
 
 	searchNotificationLayerIntroducingVulnerability = `
+	WITH subquery AS (
 		SELECT l.ID, l.name
 		FROM Vulnerability_Affects_FeatureVersion vafv, FeatureVersion fv, Layer_diff_FeatureVersion ldfv, Layer l
 		WHERE l.id >= $2
-					AND vafv.vulnerability_id = $1
-					AND vafv.featureversion_id = fv.id
-					AND ldfv.featureversion_id = fv.id
-					AND ldfv.modification = 'add'
-					AND ldfv.layer_id = l.id
+			AND vafv.vulnerability_id = $1
+			AND vafv.featureversion_id = fv.id
+			AND ldfv.featureversion_id = fv.id
+			AND ldfv.modification = 'add'
+			AND ldfv.layer_id = l.id
 		ORDER BY l.ID
-		LIMIT $3`
+	)
+
+	SELECT *
+	FROM subquery
+	LIMIT $3;
+`
 
 	// complex_test.go
 	searchComplexTestFeatureVersionAffects = `