diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff0150f68..4a46e4a41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 - Unnecessary scrollbars in the corpus selector info panel [#333](https://github.com/spraakbanken/korp-frontend/issues/333)
 - Bug with undefined `arguments`
 - On repetition error (all tokens repeat from 0), restore red outline for input
+- Use `<match>` to constraint CQP subqueries (from statistics rows etc)
 
 ## [9.5.0] - 2023-01-22
 
diff --git a/app/config/statistics_config.js b/app/config/statistics_config.js
index d7eb5ad6c..5fba282bf 100644
--- a/app/config/statistics_config.js
+++ b/app/config/statistics_config.js
@@ -21,7 +21,7 @@ let getCqp = function (hitValues, ignoreCase) {
         }
         tokens.push("[" + andExpr.join(" & ") + "]")
     }
-    return tokens.join(" ")
+    return `<match> ${tokens.join(" ")} []* </match>`
 }
 
 let reduceCqp = function (type, tokens, ignoreCase) {