diff --git a/src/lib/features/feature-search/feature.search.e2e.test.ts b/src/lib/features/feature-search/feature.search.e2e.test.ts
index f260a7766b..2066ac6628 100644
--- a/src/lib/features/feature-search/feature.search.e2e.test.ts
+++ b/src/lib/features/feature-search/feature.search.e2e.test.ts
@@ -303,6 +303,10 @@ test('should filter features by tag', async () => {
             { name: 'my_feature_c' },
         ],
     });
+
+    await filterFeaturesByTag('EXCLUDE_ALL:simple', 400);
+    await filterFeaturesByTag('EXCLUDE_ALL:simple,simple', 400);
+    await filterFeaturesByTag('EXCLUDE_ALL:simple,simple:jest', 400);
 });
 
 test('should filter features by environment status', async () => {
@@ -786,9 +790,18 @@ test('should filter features by segment', async () => {
 });
 
 test('should search features by state with operators', async () => {
-    await app.createFeature({ name: 'my_feature_a', stale: false });
-    await app.createFeature({ name: 'my_feature_b', stale: true });
-    await app.createFeature({ name: 'my_feature_c', stale: true });
+    await app.createFeature({
+        name: 'my_feature_a',
+        stale: false,
+    });
+    await app.createFeature({
+        name: 'my_feature_b',
+        stale: true,
+    });
+    await app.createFeature({
+        name: 'my_feature_c',
+        stale: true,
+    });
 
     const { body } = await filterFeaturesByState('IS:active');
     expect(body).toMatchObject({
diff --git a/src/lib/openapi/spec/feature-search-query-parameters.ts b/src/lib/openapi/spec/feature-search-query-parameters.ts
index 346f585bdf..7c06c88510 100644
--- a/src/lib/openapi/spec/feature-search-query-parameters.ts
+++ b/src/lib/openapi/spec/feature-search-query-parameters.ts
@@ -51,7 +51,7 @@ export const featureSearchQueryParameters = [
         schema: {
             type: 'string',
             pattern:
-                '^(INCLUDE|DO_NOT_INCLUDE|INCLUDE_ALL_OF|INCLUDE_ANY_OF|EXCLUDE_IF_ANY_OF|EXCLUDE_ALL):(.*?)(,([a-zA-Z0-9_]+))*$',
+                '^(INCLUDE|DO_NOT_INCLUDE|INCLUDE_ALL_OF|INCLUDE_ANY_OF|EXCLUDE_IF_ANY_OF|EXCLUDE_ALL):(?:\\s*[^,:]+:[^,:]+\\s*)(?:,\\s*[^,:]+:[^,:]+\\s*)*$',
             example: 'INCLUDE:simple:my_tag',
         },
         description: