diff --git a/packages/core/src/utils/query-transformer.ts b/packages/core/src/utils/query-transformer.ts
index 1b8c4fcd8..6412fc496 100644
--- a/packages/core/src/utils/query-transformer.ts
+++ b/packages/core/src/utils/query-transformer.ts
@@ -165,10 +165,9 @@ export function transformQuery(query: string) {
   const largeTokens = tokens.filter(
     (token) => token.length >= 3 || token === "OR"
   );
-  const ast = transformAST(parseTokens(largeTokens));
   return {
-    query: generateSQL(ast),
-    tokens: tokenizeAst(ast)
+    query: generateSQL(transformAST(parseTokens(largeTokens))),
+    tokens: tokenizeAst(transformAST(parseTokens(tokens)))
   };
 }