diff --git a/js/httpql/src/index.spec.ts b/js/httpql/src/index.spec.ts
index bca1aa0..09a0595 100644
--- a/js/httpql/src/index.spec.ts
+++ b/js/httpql/src/index.spec.ts
@@ -26,8 +26,8 @@ const readFile = (path: string) => {
 describe("httpql", () => {
   describe("ast", () => {
     const cases = [
-      1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-      21, 22, 23,
+      1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+      22, 23,
     ];
     for (const c of cases) {
       it(`Case ${c}`, () => {
diff --git a/js/httpql/src/parser/parser.terms.ts b/js/httpql/src/parser/parser.terms.ts
index 6391968..0fb36b2 100644
--- a/js/httpql/src/parser/parser.terms.ts
+++ b/js/httpql/src/parser/parser.terms.ts
@@ -1,6 +1,5 @@
 // This file was generated by lezer-generator. You probably shouldn't edit it.
-export const
-  BlockComment = 1,
+export const BlockComment = 1,
   LineComment = 2,
   HTTPQL = 3,
   Query = 4,
@@ -57,4 +56,4 @@ export const
   GroupQuery = 55,
   LogicalQuery = 56,
   And = 57,
-  Or = 58
+  Or = 58;
diff --git a/js/httpql/src/parser/parser.ts b/js/httpql/src/parser/parser.ts
index 8b9dc86..2d14e56 100644
--- a/js/httpql/src/parser/parser.ts
+++ b/js/httpql/src/parser/parser.ts
@@ -1,22 +1,39 @@
 // This file was generated by lezer-generator. You probably shouldn't edit it.
-import {LRParser, LocalTokenGroup} from "@lezer/lr"
-import {highlight} from "./props.js"
+import { LocalTokenGroup, LRParser } from "@lezer/lr";
+
+import { highlight } from "./props.js";
 export const parser = LRParser.deserialize({
   version: 14,
-  states: "-zQ]QPOOPtOPOOOyOQO'#CcOOQO'#Cb'#CbO!ROPO'#CeO!WOPO'#CmO!]OPO'#DTO!bOPO'#DZO!gOPO'#D`OOQO'#Ca'#CaO!lQPO'#DeQ!sQPOOOOQO'#C`'#C`P!{O!bO'#C]POOO)C?c)C?cOOOO'#Dj'#DjO#WOQO,58}OOQO,58},58}O#`OPO,59PO#eOPO,59XO#vOSO,59oO$ROWO,59uOoOPO,59zOOQO,5:P,5:PO$ZQPO,5:PO]QPO,5:QO]QPO,5:QPOOO'#Di'#DiP$fO!bO,58wPOOO,58w,58wOOOO-E7h-E7hOOQO1G.i1G.iO$qOPO1G.kO$vOPO1G.sO${OPO1G.sO%QOPO1G.sO%VOPO1G.sO%[OPO1G.sO%dOPO1G/ZO%iOPO1G/ZO%nOPO1G/ZOOQO'#D]'#D]OOQO'#D^'#D^OOQO1G/a1G/aOOQO'#Db'#DbOOQO1G/f1G/fOOQO1G/k1G/kOOQO1G/l1G/lO%vQPO1G/lPOOO-E7g-E7gPOOO1G.c1G.cO&UOPO7+$VO&UOPO7+$_O&ZOSO7+$_O&cOSO7+$_O&hO`O7+$_O&mOPO7+$_OoOPO7+$_O&UOPO7+$uO&ZOSO7+$uO&rOSO7+$uOoOPO7+$uO&wOPO'#CiOOQO<<Gq<<GqOOQO<<Gy<<GyO&|OPO'#CqO'ROPO'#CqO'WOPO'#CyO']OPO'#C|O'bOPO<<GyO'gOPO<<GyOOQO<<Ha<<HaO'lOPO<<HaO'qOPO<<HaO'vOPO,59TOoOPO,59]O'{OSO,59]OoOPO,59eO(TOPO,59hO&ZOSOAN=eO(YOPOAN=eO&ZOSOAN={O(_OPOAN={OOQO1G.o1G.oOOQO1G.w1G.wO(dOpO'#CtOOQO1G/P1G/POOQO1G/S1G/SOOQOG23PG23PO&ZOSOG23POOQOG23gG23gO&ZOSOG23gOOOO'#Dk'#DkO(oOpO'#CvO(zOpO,59`OOQOLD(kLD(kOOQOLD)RLD)ROOOO-E7i-E7iOOQO1G.z1G.z",
-  stateData: ")P~O!bOSQOS!cPQ~OYSObTOxUO!OVO!TWO!WYO!gQO~O!c]O~OW_O!gaO~OZbO~OZcO~OZdO~O_eO~O_fO~O!VgO~P]O!ZiO![jO~O!dkO!ekO!fmO~OW_O!goO~O[pO~OcqOdrOlsOotOsuO~OyvOzwO{xO~O!RzO!gQO~O!V!OO!ZiO![jO~O!dkO!ekO!f!SO~OZ!TO~OZ!UO~OZ!VO~OZ!WO~OZ!XO~OZ!YOu!ZO~OZ![O~OZ!]O~OZ!^Ou!_O~O!ZiO![!Yi!`!Yi!V!Yi~O^!`O~Of!cOg!dO~On!eO~Oq!fO~Ot!gO~O|!jO~O_!lO~O_!mO~O_!nO~O_!oO~O_!pO~OZ!qO~Ov!rO~OZ!sO~Ov!tO~O`!uO~Oi!wO!gQO~Or!yO~OZ!{O~OZ!}O~O!h#OO!i#OOkjP~O!h#OO!i#OOkjX~Ok#UO~O",
+  states:
+    "-zQ]QPOOPtOPOOOyOQO'#CcOOQO'#Cb'#CbO!ROPO'#CeO!WOPO'#CmO!]OPO'#DTO!bOPO'#DZO!gOPO'#D`OOQO'#Ca'#CaO!lQPO'#DeQ!sQPOOOOQO'#C`'#C`P!{O!bO'#C]POOO)C?c)C?cOOOO'#Dj'#DjO#WOQO,58}OOQO,58},58}O#`OPO,59PO#eOPO,59XO#vOSO,59oO$ROWO,59uOoOPO,59zOOQO,5:P,5:PO$ZQPO,5:PO]QPO,5:QO]QPO,5:QPOOO'#Di'#DiP$fO!bO,58wPOOO,58w,58wOOOO-E7h-E7hOOQO1G.i1G.iO$qOPO1G.kO$vOPO1G.sO${OPO1G.sO%QOPO1G.sO%VOPO1G.sO%[OPO1G.sO%dOPO1G/ZO%iOPO1G/ZO%nOPO1G/ZOOQO'#D]'#D]OOQO'#D^'#D^OOQO1G/a1G/aOOQO'#Db'#DbOOQO1G/f1G/fOOQO1G/k1G/kOOQO1G/l1G/lO%vQPO1G/lPOOO-E7g-E7gPOOO1G.c1G.cO&UOPO7+$VO&UOPO7+$_O&ZOSO7+$_O&cOSO7+$_O&hO`O7+$_O&mOPO7+$_OoOPO7+$_O&UOPO7+$uO&ZOSO7+$uO&rOSO7+$uOoOPO7+$uO&wOPO'#CiOOQO<<Gq<<GqOOQO<<Gy<<GyO&|OPO'#CqO'ROPO'#CqO'WOPO'#CyO']OPO'#C|O'bOPO<<GyO'gOPO<<GyOOQO<<Ha<<HaO'lOPO<<HaO'qOPO<<HaO'vOPO,59TOoOPO,59]O'{OSO,59]OoOPO,59eO(TOPO,59hO&ZOSOAN=eO(YOPOAN=eO&ZOSOAN={O(_OPOAN={OOQO1G.o1G.oOOQO1G.w1G.wO(dOpO'#CtOOQO1G/P1G/POOQO1G/S1G/SOOQOG23PG23PO&ZOSOG23POOQOG23gG23gO&ZOSOG23gOOOO'#Dk'#DkO(oOpO'#CvO(zOpO,59`OOQOLD(kLD(kOOQOLD)RLD)ROOOO-E7i-E7iOOQO1G.z1G.z",
+  stateData:
+    ")P~O!bOSQOS!cPQ~OYSObTOxUO!OVO!TWO!WYO!gQO~O!c]O~OW_O!gaO~OZbO~OZcO~OZdO~O_eO~O_fO~O!VgO~P]O!ZiO![jO~O!dkO!ekO!fmO~OW_O!goO~O[pO~OcqOdrOlsOotOsuO~OyvOzwO{xO~O!RzO!gQO~O!V!OO!ZiO![jO~O!dkO!ekO!f!SO~OZ!TO~OZ!UO~OZ!VO~OZ!WO~OZ!XO~OZ!YOu!ZO~OZ![O~OZ!]O~OZ!^Ou!_O~O!ZiO![!Yi!`!Yi!V!Yi~O^!`O~Of!cOg!dO~On!eO~Oq!fO~Ot!gO~O|!jO~O_!lO~O_!mO~O_!nO~O_!oO~O_!pO~OZ!qO~Ov!rO~OZ!sO~Ov!tO~O`!uO~Oi!wO!gQO~Or!yO~OZ!{O~OZ!}O~O!h#OO!i#OOkjP~O!h#OO!i#OOkjX~Ok#UO~O",
   goto: "$x!`P!aPP!d!p!v!|P!vPPP#gPPP!vPPP#pPP$SP$VPP$YPP$]PPPPPP!vPPPPP!vP$`$`P!vP$cPP!p!pPP$f$l$rR^PQZOQhYQ!PiR!QjX[OYijXXOYijWROYijQyeQ|fQ!h!ZQ!k!_S!v!m!nR!x!oQ!a!TQ!b!UR!i![Q!b!VQ!i!]Q!z!qQ!|!sQ#R!{R#S!}R!v!nR#Q!wR!b!WR!b!XR{eR}fQl]R!RlQ`QRn`Q#P!wR#T#P",
-  nodeNames: "⚠ BlockComment LineComment HTTPQL Query Clause StringClause StringValue StringChar RowClause RowNamespace Dot RowIntFieldName IntExpression IntOperator Colon IntValue RequestClause RequestNamespace RequestIntFieldName RequestStringFieldName StringExpression StringOperator RegexOperator RegexValue RegexDelim RegexContent / RequestDateFieldName DateExpression DateOperator RequestBoolFieldName BoolExpression BoolOperator BoolValue RequestHeaderFieldName RequestHeaderSubfieldName LeftBracket RightBracket ResponseClause ResponseNamespace ResponseIntFieldName ResponseStringFieldName ResponseHeaderFieldName ResponseHeaderSubfieldName PresetClause PresetNamespace PresetNameExpression PresetAliasExpression SymbolValue SourceClause SourceNamespace SourceNameExpression RightParen LeftParen GroupQuery LogicalQuery And Or",
+  nodeNames:
+    "⚠ BlockComment LineComment HTTPQL Query Clause StringClause StringValue StringChar RowClause RowNamespace Dot RowIntFieldName IntExpression IntOperator Colon IntValue RequestClause RequestNamespace RequestIntFieldName RequestStringFieldName StringExpression StringOperator RegexOperator RegexValue RegexDelim RegexContent / RequestDateFieldName DateExpression DateOperator RequestBoolFieldName BoolExpression BoolOperator BoolValue RequestHeaderFieldName RequestHeaderSubfieldName LeftBracket RightBracket ResponseClause ResponseNamespace ResponseIntFieldName ResponseStringFieldName ResponseHeaderFieldName ResponseHeaderSubfieldName PresetClause PresetNamespace PresetNameExpression PresetAliasExpression SymbolValue SourceClause SourceNamespace SourceNameExpression RightParen LeftParen GroupQuery LogicalQuery And Or",
   maxTerm: 71,
   nodeProps: [
-    ["openedBy", 53,"LeftParen"],
-    ["closedBy", 54,"RightParen"]
+    ["openedBy", 53, "LeftParen"],
+    ["closedBy", 54, "RightParen"],
   ],
   propSources: [highlight],
-  skippedNodes: [0,1,2,59],
+  skippedNodes: [0, 1, 2, 59],
   repeatNodeCount: 3,
-  tokenData: "!5W~R!cX^%^pq%cqr%jrs%osx%jxy%tyz%{z}%j}!O&S!O!P&x!P!Q'P!Q!['z![!](t!]!c%j!c!d({!d!q%j!q!r)`!r!}%j!}#O)m#O#P)t#P#Q+f#Q#R%j#R#S&S#S#T%j#T#U+m#U#V-S#V#W/S#W#X&S#X#Y6a#Y#Z8e#Z#[:w#[#]<b#]#^?|#^#`&S#`#a@z#a#bCo#b#cFY#c#dLk#d#eMi#e#f!%T#f#g!'V#g#h!.h#h#i!1f#i#j&S#j#k!3j#k#o&S#o#y%j#y#z%c#z$f%j$f$g%c$g#BY%j#BY#BZ%c#BZ$IS%j$IS$I_%c$I_$I|%j$I|$JO%c$JO$JT%j$JT$JU%c$JU$KV%j$KV$KW%c$KW&FU%j&FU&FV%c&FV;'S%j;'S;=`!5Q<%lO%jS%cO!bS[%jOWW!bSW%oOWW~%tO!g~[%{O!WSWW[&SO!VSWWx&ZSWW!Rp}!O&g!Q![&g#R#S&g#T#o&gp&lS!Rp}!O&g!Q![&g#R#S&g#T#o&g['POZSWWl'WQi`WWz{'^!P!Q'cS'cO!cSS'hSQSOY'cZ;'S'c;'S;=`'t<%lO'cS'wP;=`<%l'c|(TS`SWW!Rp}!O&g!Q![(a#R#S&g#T#o&gt(hS`S!Rp}!O&g!Q![(a#R#S&g#T#o&g[({O_SWW[)QPWW!p!q)TS)WP!f!g)ZS)`O!ZS[)ePWW!t!u)hS)mO![S[)tOuSWWW)wXrs%j!P!Q%j#O#P%j#U#V%j#Y#Z%j#b#c%j#f#g%j#h#i%j#i#j*dW*gR!Q![*p!c!i*p#T#Z*pW*sR!Q![*|!c!i*|#T#Z*|W+PR!Q![+Y!c!i+Y#T#Z+YW+]R!Q![%j!c!i%j#T#Z%j[+mOvSWW|+tUWW!Rp}!O&g!Q![&g#R#S&g#T#b&g#b#c,W#c#o&gt,]U!Rp}!O&g!Q![&g#R#S&g#T#W&g#W#X,o#X#o&gt,vS!ZS!Rp}!O&g!Q![&g#R#S&g#T#o&g!^-ZUWW!Rp}!O&g!Q![&g#R#S&g#T#c&g#c#d-m#d#o&g!U-rU!Rp}!O&g!Q![&g#R#S&g#T#W&g#W#X.U#X#o&g!U.ZU!Rp}!O&g!Q![&g#R#S&g#T#m&g#m#n.m#n#o&g!U.vSdSz`!Rp}!O&g!Q![&g#R#S&g#T#o&g!^/ZWWW!Rp}!O&g!Q![&g#R#S&g#T#c&g#c#d/s#d#f&g#f#g2Y#g#o&g!Q/xW!Rp}!O&g!Q![&g#R#S&g#T#W&g#W#X0b#X#b&g#b#c1^#c#o&g!Q0gU!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#Y0y#Y#o&g!Q1QSy`!Rp}!O&g!Q![&g#R#S&g#T#o&g!Q1cU!Rp}!O&g!Q![&g#R#S&g#T#h&g#h#i1u#i#o&g!Q1|Sf`!Rp}!O&g!Q![&g#R#S&g#T#o&gt2_U!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#Y2q#Y#o&gt2vT!Rp}!O&g!Q![&g#R#S&g#T#U3V#U#o&gt3[U!Rp}!O&g!Q![&g#R#S&g#T#h&g#h#i3n#i#o&gt3sU!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#Y4V#Y#o&gt4[U!Rp}!O&g!Q![&g#R#S&g#T#W&g#W#X4n#X#o&gt4sS!Rp}!O&g!Q![&g#R#S5P#T#o&gt5UT!Rp}!O&g!Q![&g#R#S&g#T#U5e#U#o&gt5jU!Rp}!O&g!Q![&g#R#S&g#T#h&g#h#i5|#i#o&gt6TSlS!Rp}!O&g!Q![&g#R#S&g#T#o&g#p6hWWW!Rp}!O&g!Q![&g#R#S&g#T#e&g#e#f7Q#f#l&g#l#m7i#m#o&g#h7]Sq!b^Sf`!Rp}!O&g!Q![&g#R#S&g#T#o&gt7nU!Rp}!O&g!Q![&g#R#S&g#T#h&g#h#i8Q#i#o&gt8XSdS!Rp}!O&g!Q![&g#R#S&g#T#o&g|8lTWW!Rp}!O&g!Q![&g#R#S&g#T#U8{#U#o&gt9QU!Rp}!O&g!Q![&g#R#S&g#T#`&g#`#a9d#a#o&gt9iU!Rp}!O&g!Q![&g#R#S&g#T#g&g#g#h9{#h#o&gt:QU!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#Y:d#Y#o&gt:kSrS!Rp}!O&g!Q![&g#R#S&g#T#o&g!^;OUWW!Rp}!O&g!Q![&g#R#S&g#T#h&g#h#i;b#i#o&g!U;kUn`^S!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#Y;}#Y#o&gt<US^S!Rp}!O&g!Q![&g#R#S&g#T#o&g!^<iWWW!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#Y=R#Y#c&g#c#d?e#d#o&g!U=WT!Rp}!O&g!Q![&g#R#S&g#T#U=g#U#o&g!U=lU!Rp}!O&g!Q![&g#R#S&g#T#W&g#W#X>O#X#o&g!U>TU!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#Y>g#Y#o&g!U>lU!Rp}!O&g!Q![&g#R#S&g#T#f&g#f#g?O#g#o&g!U?XSsS{`!Rp}!O&g!Q![&g#R#S&g#T#o&gt?jU!Rp}!O&g!Q![&g#R#S&g#T#g&g#g#h7i#h#o&g|@TUWW!Rp}!O&g!Q![&g#R#S&g#T#W&g#W#X@g#X#o&gt@nS[S!Rp}!O&g!Q![&g#R#S&g#T#o&g!^ARYWW!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#YAq#Y#]&g#]#^Bo#^#h&g#h#i;b#i#o&g!UAvU!Rp}!O&g!Q![&g#R#S&g#T#b&g#b#cBY#c#o&g!UBcScSy`!Rp}!O&g!Q![&g#R#S&g#T#o&g!QBtU!Rp}!O&g!Q![&g#R#S&g#T#_&g#_#`CW#`#o&g!QC]U!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#Y1u#Y#o&g|CvUWW!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#YDY#Y#o&gtD_U!Rp}!O&g!Q![&g#R#S&g#T#h&g#h#iDq#i#o&gtDvU!Rp}!O&g!Q![&g#R#S&g#T#[&g#[#]EY#]#o&gtE_U!Rp}!O&g!Q![&g#R#S&g#T#c&g#c#dEq#d#o&gtEvU!Rp}!O&g!Q![&g#R#S&g#T#W&g#W#X8Q#X#o&g#pFa]WW!Rp}!O&g!Q![&g#R#S&g#T#UGY#U#V&g#V#WHo#W#X&g#X#Y7Q#Y#`&g#`#aIo#a#f&g#f#gJW#g#o&g!UG_U!Rp}!O&g!Q![&g#R#S&g#T#a&g#a#bGq#b#o&g!UGvU!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#YHY#Y#o&g!UHcStS|`!Rp}!O&g!Q![&g#R#S&g#T#o&g!QHtU!Rp}!O&g!Q![&g#R#S&g#T#c&g#c#dIW#d#o&g!QI]U!Rp}!O&g!Q![&g#R#S&g#T#b&g#b#c1^#c#o&g!QItU!Rp}!O&g!Q![&g#R#S&g#T#]&g#]#^Bo#^#o&g!QJ]U!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#YJo#Y#o&g!QJtU!Rp}!O&g!Q![&g#R#S&g#T#Z&g#Z#[KW#[#o&g!QK]U!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#YKo#Y#o&g!QKtU!Rp}!O&g!Q![&g#R#S&g#T#l&g#l#mLW#m#o&g!QL_Sg`!Rp}!O&g!Q![&g#R#S&g#T#o&g|LrUWW!Rp}!O&g!Q![&g#R#S&g#T#f&g#f#gMU#g#o&gtM]S![S!Rp}!O&g!Q![&g#R#S&g#T#o&g|MpXWW!Rp}!O&g!Q![&g#R#S&g#T#UN]#U#c&g#c#d! ]#d#f&g#f#g!!p#g#o&gtNbU!Rp}!O&g!Q![&g#R#S&g#T#h&g#h#iNt#i#o&gtNyU!Rp}!O&g!Q![&g#R#S&g#T#[&g#[#]8Q#]#o&gt! bU!Rp}!O&g!Q![&g#R#S&g#T#f&g#f#g! t#g#o&gt! yU!Rp}!O&g!Q![&g#R#S&g#T#h&g#h#i!!]#i#o&gt!!dScS!Rp}!O&g!Q![&g#R#S&g#T#o&gt!!uU!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#Y!#X#Y#o&gt!#^U!Rp}!O&g!Q![&g#R#S&g#T#g&g#g#h!#p#h#o&gt!#uU!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#Y!$X#Y#o&gt!$^U!Rp}!O&g!Q![&g#R#S&g#T#h&g#h#i!$p#i#o&gt!$wS!OS!Rp}!O&g!Q![&g#R#S&g#T#o&g|!%[UWW!Rp}!O&g!Q![&g#R#S&g#T#i&g#i#j!%n#j#o&gt!%sU!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#Y!&V#Y#o&gt!&[U!Rp}!O&g!Q![&g#R#S&g#T#f&g#f#g!&n#g#o&gt!&sU!Rp}!O&g!Q![&g#R#S&g#T#m&g#m#n8Q#n#o&g!^!'^XWW!Rp}!O&g!Q![&g#R#S&g#T#U!'y#U#X&g#X#Y!(b#Y#c&g#c#d!*f#d#o&g!U!(OU!Rp}!O&g!Q![&g#R#S&g#T#k&g#k#l.m#l#o&g!U!(gY!Rp}!O&g!Q![&g#R#S&g#T#Z&g#Z#[KW#[#e&g#e#f!)V#f#g&g#g#h!)j#h#o&gt!)^SbS!Rp}!O&g!Q![&g#R#S&g#T#o&gt!)oU!Rp}!O&g!Q![&g#R#S&g#T#d&g#d#e!*R#e#o&gt!*YSxS!Rp}!O&g!Q![&g#R#S&g#T#o&g!U!*kW!Rp}!O&g!Q![&g#R#S&g#T#i&g#i#j!+T#j#k&g#k#l!.T#l#o&g!Q!+YU!Rp}!O&g!Q![&g#R#S&g#T#b&g#b#c!+l#c#o&g!Q!+qU!Rp}!O&g!Q![&g#R#S&g#T#W&g#W#X!,T#X#o&g!Q!,YU!Rp}!O&g!Q![&g#R#S&g#T#h&g#h#i!,l#i#o&g!Q!,qU!Rp}!O&g!Q![&g#R#S&g#T#f&g#f#g!-T#g#o&g!Q!-YU!Rp}!O&g!Q![&g#R#S&g#T#]&g#]#^!-l#^#o&g!Q!-qU!Rp}!O&g!Q![&g#R#S&g#T#d&g#d#e0y#e#o&gt!.[SYS!Rp}!O&g!Q![&g#R#S&g#T#o&g|!.oUWW!Rp}!O&g!Q![&g#R#S&g#T#c&g#c#d!/R#d#o&gt!/WU!Rp}!O&g!Q![&g#R#S&g#T#i&g#i#j!/j#j#o&gt!/oU!Rp}!O&g!Q![&g#R#S&g#T#f&g#f#g!0R#g#o&gt!0WU!Rp}!O&g!Q![&g#R#S&g#T#V&g#V#W!0j#W#o&gt!0oU!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#Y!1R#Y#o&gt!1YS!TS!Rp}!O&g!Q![&g#R#S&g#T#o&g|!1mWWW!Rp}!O&g!Q![&g#R#S&g#T#`&g#`#a!2V#a#f&g#f#g!3R#g#o&gt!2[U!Rp}!O&g!Q![&g#R#S&g#T#g&g#g#h!2n#h#o&gt!2uSoS!Rp}!O&g!Q![&g#R#S&g#T#o&gt!3WU!Rp}!O&g!Q![&g#R#S&g#T#i&g#i#j9{#j#o&g!^!3qTWW!Rp}!O&g!Q![&g#R#S&g#T#U!4Q#U#o&g!U!4VU!Rp}!O&g!Q![&g#R#S&g#T#`&g#`#a!4i#a#o&g!U!4nU!Rp}!O&g!Q![&g#R#S&g#T#i&g#i#jGq#j#o&gW!5TP;=`<%l%j",
-  tokenizers: [2, 3, 4, 5, 6, new LocalTokenGroup("x~RQ!P!QX#O#P^~^Ok~~aRO;'Sj;'S;=`o;=`Oj~oO!i~~tP!i~;=`<%lj~", 39, 70), new LocalTokenGroup("u~RRYZ[]^az{i~aO!e~~fP!e~YZ[~lP!P!Qo~tO!f~~", 36, 66)],
-  topRules: {"HTTPQL":[0,3]},
-  tokenPrec: 0
-})
+  tokenData:
+    "!5W~R!cX^%^pq%cqr%jrs%osx%jxy%tyz%{z}%j}!O&S!O!P&x!P!Q'P!Q!['z![!](t!]!c%j!c!d({!d!q%j!q!r)`!r!}%j!}#O)m#O#P)t#P#Q+f#Q#R%j#R#S&S#S#T%j#T#U+m#U#V-S#V#W/S#W#X&S#X#Y6a#Y#Z8e#Z#[:w#[#]<b#]#^?|#^#`&S#`#a@z#a#bCo#b#cFY#c#dLk#d#eMi#e#f!%T#f#g!'V#g#h!.h#h#i!1f#i#j&S#j#k!3j#k#o&S#o#y%j#y#z%c#z$f%j$f$g%c$g#BY%j#BY#BZ%c#BZ$IS%j$IS$I_%c$I_$I|%j$I|$JO%c$JO$JT%j$JT$JU%c$JU$KV%j$KV$KW%c$KW&FU%j&FU&FV%c&FV;'S%j;'S;=`!5Q<%lO%jS%cO!bS[%jOWW!bSW%oOWW~%tO!g~[%{O!WSWW[&SO!VSWWx&ZSWW!Rp}!O&g!Q![&g#R#S&g#T#o&gp&lS!Rp}!O&g!Q![&g#R#S&g#T#o&g['POZSWWl'WQi`WWz{'^!P!Q'cS'cO!cSS'hSQSOY'cZ;'S'c;'S;=`'t<%lO'cS'wP;=`<%l'c|(TS`SWW!Rp}!O&g!Q![(a#R#S&g#T#o&gt(hS`S!Rp}!O&g!Q![(a#R#S&g#T#o&g[({O_SWW[)QPWW!p!q)TS)WP!f!g)ZS)`O!ZS[)ePWW!t!u)hS)mO![S[)tOuSWWW)wXrs%j!P!Q%j#O#P%j#U#V%j#Y#Z%j#b#c%j#f#g%j#h#i%j#i#j*dW*gR!Q![*p!c!i*p#T#Z*pW*sR!Q![*|!c!i*|#T#Z*|W+PR!Q![+Y!c!i+Y#T#Z+YW+]R!Q![%j!c!i%j#T#Z%j[+mOvSWW|+tUWW!Rp}!O&g!Q![&g#R#S&g#T#b&g#b#c,W#c#o&gt,]U!Rp}!O&g!Q![&g#R#S&g#T#W&g#W#X,o#X#o&gt,vS!ZS!Rp}!O&g!Q![&g#R#S&g#T#o&g!^-ZUWW!Rp}!O&g!Q![&g#R#S&g#T#c&g#c#d-m#d#o&g!U-rU!Rp}!O&g!Q![&g#R#S&g#T#W&g#W#X.U#X#o&g!U.ZU!Rp}!O&g!Q![&g#R#S&g#T#m&g#m#n.m#n#o&g!U.vSdSz`!Rp}!O&g!Q![&g#R#S&g#T#o&g!^/ZWWW!Rp}!O&g!Q![&g#R#S&g#T#c&g#c#d/s#d#f&g#f#g2Y#g#o&g!Q/xW!Rp}!O&g!Q![&g#R#S&g#T#W&g#W#X0b#X#b&g#b#c1^#c#o&g!Q0gU!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#Y0y#Y#o&g!Q1QSy`!Rp}!O&g!Q![&g#R#S&g#T#o&g!Q1cU!Rp}!O&g!Q![&g#R#S&g#T#h&g#h#i1u#i#o&g!Q1|Sf`!Rp}!O&g!Q![&g#R#S&g#T#o&gt2_U!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#Y2q#Y#o&gt2vT!Rp}!O&g!Q![&g#R#S&g#T#U3V#U#o&gt3[U!Rp}!O&g!Q![&g#R#S&g#T#h&g#h#i3n#i#o&gt3sU!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#Y4V#Y#o&gt4[U!Rp}!O&g!Q![&g#R#S&g#T#W&g#W#X4n#X#o&gt4sS!Rp}!O&g!Q![&g#R#S5P#T#o&gt5UT!Rp}!O&g!Q![&g#R#S&g#T#U5e#U#o&gt5jU!Rp}!O&g!Q![&g#R#S&g#T#h&g#h#i5|#i#o&gt6TSlS!Rp}!O&g!Q![&g#R#S&g#T#o&g#p6hWWW!Rp}!O&g!Q![&g#R#S&g#T#e&g#e#f7Q#f#l&g#l#m7i#m#o&g#h7]Sq!b^Sf`!Rp}!O&g!Q![&g#R#S&g#T#o&gt7nU!Rp}!O&g!Q![&g#R#S&g#T#h&g#h#i8Q#i#o&gt8XSdS!Rp}!O&g!Q![&g#R#S&g#T#o&g|8lTWW!Rp}!O&g!Q![&g#R#S&g#T#U8{#U#o&gt9QU!Rp}!O&g!Q![&g#R#S&g#T#`&g#`#a9d#a#o&gt9iU!Rp}!O&g!Q![&g#R#S&g#T#g&g#g#h9{#h#o&gt:QU!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#Y:d#Y#o&gt:kSrS!Rp}!O&g!Q![&g#R#S&g#T#o&g!^;OUWW!Rp}!O&g!Q![&g#R#S&g#T#h&g#h#i;b#i#o&g!U;kUn`^S!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#Y;}#Y#o&gt<US^S!Rp}!O&g!Q![&g#R#S&g#T#o&g!^<iWWW!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#Y=R#Y#c&g#c#d?e#d#o&g!U=WT!Rp}!O&g!Q![&g#R#S&g#T#U=g#U#o&g!U=lU!Rp}!O&g!Q![&g#R#S&g#T#W&g#W#X>O#X#o&g!U>TU!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#Y>g#Y#o&g!U>lU!Rp}!O&g!Q![&g#R#S&g#T#f&g#f#g?O#g#o&g!U?XSsS{`!Rp}!O&g!Q![&g#R#S&g#T#o&gt?jU!Rp}!O&g!Q![&g#R#S&g#T#g&g#g#h7i#h#o&g|@TUWW!Rp}!O&g!Q![&g#R#S&g#T#W&g#W#X@g#X#o&gt@nS[S!Rp}!O&g!Q![&g#R#S&g#T#o&g!^ARYWW!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#YAq#Y#]&g#]#^Bo#^#h&g#h#i;b#i#o&g!UAvU!Rp}!O&g!Q![&g#R#S&g#T#b&g#b#cBY#c#o&g!UBcScSy`!Rp}!O&g!Q![&g#R#S&g#T#o&g!QBtU!Rp}!O&g!Q![&g#R#S&g#T#_&g#_#`CW#`#o&g!QC]U!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#Y1u#Y#o&g|CvUWW!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#YDY#Y#o&gtD_U!Rp}!O&g!Q![&g#R#S&g#T#h&g#h#iDq#i#o&gtDvU!Rp}!O&g!Q![&g#R#S&g#T#[&g#[#]EY#]#o&gtE_U!Rp}!O&g!Q![&g#R#S&g#T#c&g#c#dEq#d#o&gtEvU!Rp}!O&g!Q![&g#R#S&g#T#W&g#W#X8Q#X#o&g#pFa]WW!Rp}!O&g!Q![&g#R#S&g#T#UGY#U#V&g#V#WHo#W#X&g#X#Y7Q#Y#`&g#`#aIo#a#f&g#f#gJW#g#o&g!UG_U!Rp}!O&g!Q![&g#R#S&g#T#a&g#a#bGq#b#o&g!UGvU!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#YHY#Y#o&g!UHcStS|`!Rp}!O&g!Q![&g#R#S&g#T#o&g!QHtU!Rp}!O&g!Q![&g#R#S&g#T#c&g#c#dIW#d#o&g!QI]U!Rp}!O&g!Q![&g#R#S&g#T#b&g#b#c1^#c#o&g!QItU!Rp}!O&g!Q![&g#R#S&g#T#]&g#]#^Bo#^#o&g!QJ]U!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#YJo#Y#o&g!QJtU!Rp}!O&g!Q![&g#R#S&g#T#Z&g#Z#[KW#[#o&g!QK]U!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#YKo#Y#o&g!QKtU!Rp}!O&g!Q![&g#R#S&g#T#l&g#l#mLW#m#o&g!QL_Sg`!Rp}!O&g!Q![&g#R#S&g#T#o&g|LrUWW!Rp}!O&g!Q![&g#R#S&g#T#f&g#f#gMU#g#o&gtM]S![S!Rp}!O&g!Q![&g#R#S&g#T#o&g|MpXWW!Rp}!O&g!Q![&g#R#S&g#T#UN]#U#c&g#c#d! ]#d#f&g#f#g!!p#g#o&gtNbU!Rp}!O&g!Q![&g#R#S&g#T#h&g#h#iNt#i#o&gtNyU!Rp}!O&g!Q![&g#R#S&g#T#[&g#[#]8Q#]#o&gt! bU!Rp}!O&g!Q![&g#R#S&g#T#f&g#f#g! t#g#o&gt! yU!Rp}!O&g!Q![&g#R#S&g#T#h&g#h#i!!]#i#o&gt!!dScS!Rp}!O&g!Q![&g#R#S&g#T#o&gt!!uU!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#Y!#X#Y#o&gt!#^U!Rp}!O&g!Q![&g#R#S&g#T#g&g#g#h!#p#h#o&gt!#uU!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#Y!$X#Y#o&gt!$^U!Rp}!O&g!Q![&g#R#S&g#T#h&g#h#i!$p#i#o&gt!$wS!OS!Rp}!O&g!Q![&g#R#S&g#T#o&g|!%[UWW!Rp}!O&g!Q![&g#R#S&g#T#i&g#i#j!%n#j#o&gt!%sU!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#Y!&V#Y#o&gt!&[U!Rp}!O&g!Q![&g#R#S&g#T#f&g#f#g!&n#g#o&gt!&sU!Rp}!O&g!Q![&g#R#S&g#T#m&g#m#n8Q#n#o&g!^!'^XWW!Rp}!O&g!Q![&g#R#S&g#T#U!'y#U#X&g#X#Y!(b#Y#c&g#c#d!*f#d#o&g!U!(OU!Rp}!O&g!Q![&g#R#S&g#T#k&g#k#l.m#l#o&g!U!(gY!Rp}!O&g!Q![&g#R#S&g#T#Z&g#Z#[KW#[#e&g#e#f!)V#f#g&g#g#h!)j#h#o&gt!)^SbS!Rp}!O&g!Q![&g#R#S&g#T#o&gt!)oU!Rp}!O&g!Q![&g#R#S&g#T#d&g#d#e!*R#e#o&gt!*YSxS!Rp}!O&g!Q![&g#R#S&g#T#o&g!U!*kW!Rp}!O&g!Q![&g#R#S&g#T#i&g#i#j!+T#j#k&g#k#l!.T#l#o&g!Q!+YU!Rp}!O&g!Q![&g#R#S&g#T#b&g#b#c!+l#c#o&g!Q!+qU!Rp}!O&g!Q![&g#R#S&g#T#W&g#W#X!,T#X#o&g!Q!,YU!Rp}!O&g!Q![&g#R#S&g#T#h&g#h#i!,l#i#o&g!Q!,qU!Rp}!O&g!Q![&g#R#S&g#T#f&g#f#g!-T#g#o&g!Q!-YU!Rp}!O&g!Q![&g#R#S&g#T#]&g#]#^!-l#^#o&g!Q!-qU!Rp}!O&g!Q![&g#R#S&g#T#d&g#d#e0y#e#o&gt!.[SYS!Rp}!O&g!Q![&g#R#S&g#T#o&g|!.oUWW!Rp}!O&g!Q![&g#R#S&g#T#c&g#c#d!/R#d#o&gt!/WU!Rp}!O&g!Q![&g#R#S&g#T#i&g#i#j!/j#j#o&gt!/oU!Rp}!O&g!Q![&g#R#S&g#T#f&g#f#g!0R#g#o&gt!0WU!Rp}!O&g!Q![&g#R#S&g#T#V&g#V#W!0j#W#o&gt!0oU!Rp}!O&g!Q![&g#R#S&g#T#X&g#X#Y!1R#Y#o&gt!1YS!TS!Rp}!O&g!Q![&g#R#S&g#T#o&g|!1mWWW!Rp}!O&g!Q![&g#R#S&g#T#`&g#`#a!2V#a#f&g#f#g!3R#g#o&gt!2[U!Rp}!O&g!Q![&g#R#S&g#T#g&g#g#h!2n#h#o&gt!2uSoS!Rp}!O&g!Q![&g#R#S&g#T#o&gt!3WU!Rp}!O&g!Q![&g#R#S&g#T#i&g#i#j9{#j#o&g!^!3qTWW!Rp}!O&g!Q![&g#R#S&g#T#U!4Q#U#o&g!U!4VU!Rp}!O&g!Q![&g#R#S&g#T#`&g#`#a!4i#a#o&g!U!4nU!Rp}!O&g!Q![&g#R#S&g#T#i&g#i#jGq#j#o&gW!5TP;=`<%l%j",
+  tokenizers: [
+    2,
+    3,
+    4,
+    5,
+    6,
+    new LocalTokenGroup(
+      "x~RQ!P!QX#O#P^~^Ok~~aRO;'Sj;'S;=`o;=`Oj~oO!i~~tP!i~;=`<%lj~",
+      39,
+      70,
+    ),
+    new LocalTokenGroup("u~RRYZ[]^az{i~aO!e~~fP!e~YZ[~lP!P!Qo~tO!f~~", 36, 66),
+  ],
+  topRules: { HTTPQL: [0, 3] },
+  tokenPrec: 0,
+});
diff --git a/js/httpql/src/serialize.ts b/js/httpql/src/serialize.ts
index d2b3c6a..0abb8b1 100644
--- a/js/httpql/src/serialize.ts
+++ b/js/httpql/src/serialize.ts
@@ -2,7 +2,6 @@ import { err, ok, Result } from "neverthrow";
 
 import { type HTTPQLError, InvalidQuery } from "./errors.js";
 import {
-  OperatorString,
   type ClauseHeader,
   type ClauseRequest,
   type ClauseResponse,
@@ -13,6 +12,7 @@ import {
   type ExprPreset,
   type ExprSource,
   type ExprString,
+  OperatorString,
   type Query,
 } from "./primitives.js";
 import { isPresent } from "./utils.js";
diff --git a/js/streamql/package.json b/js/streamql/package.json
index 3a738a9..e99baaf 100644
--- a/js/streamql/package.json
+++ b/js/streamql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@caido/streamql",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Parser for the StreamQL language",
   "author": "Caido Labs Inc. <dev@caido.io>",
   "repository": "https://github.com/caido/httpql",
diff --git a/js/streamql/src/deserialize/clause.websocket.ts b/js/streamql/src/deserialize/clause.websocket.ts
index 6dfa671..5658843 100644
--- a/js/streamql/src/deserialize/clause.websocket.ts
+++ b/js/streamql/src/deserialize/clause.websocket.ts
@@ -8,6 +8,7 @@ import type { ClauseWs } from "../primitives.js";
 import { getChildString, isPresent } from "../utils.js";
 
 import { deserializeDateExpr } from "./expr.date.js";
+import { deserializeIntExpr } from "./expr.int.js";
 import { deserializeStringExpr } from "./expr.string.js";
 
 export const deserializeWsClause = (
@@ -40,6 +41,17 @@ export const deserializeWsClause = (
     }
   })();
 
+  const intField = (() => {
+    const child = getChildString(node, terms.WsIntFieldName, doc);
+
+    if (isPresent(child)) {
+      switch (child) {
+        case "len":
+          return "len";
+      }
+    }
+  })();
+
   const stringFilter = (() => {
     const child = node.getChild(terms.StringExpression);
     if (isPresent(child)) return deserializeStringExpr(child, doc);
@@ -50,6 +62,11 @@ export const deserializeWsClause = (
     if (isPresent(child)) return deserializeDateExpr(child, doc);
   })();
 
+  const intFilter = (() => {
+    const child = node.getChild(terms.IntExpression);
+    if (isPresent(child)) return deserializeIntExpr(child, doc);
+  })();
+
   if (isPresent(stringField) && isPresent(stringFilter)) {
     return stringFilter.map((filter) => {
       return {
@@ -66,5 +83,13 @@ export const deserializeWsClause = (
     });
   }
 
+  if (isPresent(intField) && isPresent(intFilter)) {
+    return intFilter.map((filter) => {
+      return {
+        [intField]: filter,
+      };
+    });
+  }
+
   return err(new InvalidQuery());
 };
diff --git a/js/streamql/src/deserialize/index.spec.ts b/js/streamql/src/deserialize/index.spec.ts
index 50d15f9..be3b361 100644
--- a/js/streamql/src/deserialize/index.spec.ts
+++ b/js/streamql/src/deserialize/index.spec.ts
@@ -103,6 +103,29 @@ describe("deserialize", () => {
     });
   });
 
+  it("should parse StreamQL ws len expression", () => {
+    const query = "ws.len.gte:1212";
+
+    const filter = deserialize(query)._unsafeUnwrap();
+
+    expect(filter).to.deep.equal({
+      websocket: {
+        len: {
+          operator: OperatorInt.Gte,
+          value: 1212,
+        },
+      },
+    });
+  });
+
+  it("should fail given a quoted ws len value", () => {
+    const query = 'ws.len.lt:"12"';
+
+    const result = deserialize(query);
+
+    expect(result.isErr()).to.be.true;
+  });
+
   it("should parse StreamQL AND expression", () => {
     const query = 'stream.host.cont:"test.com" AND ws.direction.eq:"client"';
 
diff --git a/js/streamql/src/index.spec.ts b/js/streamql/src/index.spec.ts
index 78e30bb..2693ef8 100644
--- a/js/streamql/src/index.spec.ts
+++ b/js/streamql/src/index.spec.ts
@@ -26,7 +26,7 @@ const readFile = (path: string) => {
 
 describe("streamql", () => {
   describe("ast", () => {
-    const cases = [1, 2, 3, 4];
+    const cases = [1, 2, 3, 4, 5];
     for (const c of cases) {
       it(`Case ${c}`, () => {
         const input = readFile(`ast/${c}/input.streamql`);
diff --git a/js/streamql/src/primitives.ts b/js/streamql/src/primitives.ts
index f94f913..a5fd978 100644
--- a/js/streamql/src/primitives.ts
+++ b/js/streamql/src/primitives.ts
@@ -14,6 +14,7 @@ export type ClauseWs = {
   raw?: Maybe<ExprString>;
   direction?: Maybe<ExprString>;
   format?: Maybe<ExprString>;
+  len?: Maybe<ExprInt>;
 };
 
 export type ClauseStream = {
diff --git a/js/streamql/src/serialize.ts b/js/streamql/src/serialize.ts
index 0282fd0..277b964 100644
--- a/js/streamql/src/serialize.ts
+++ b/js/streamql/src/serialize.ts
@@ -65,6 +65,9 @@ const serializeClauseWs = (value: ClauseWs): Result<string, StreamQLError> => {
   if (isPresent(value.format)) {
     return serializeExprString(value.format).map((str) => `format.${str}`);
   }
+  if (isPresent(value.len)) {
+    return serializeExprInt(value.len).map((str) => `len.${str}`);
+  }
 
   return err(new InvalidQuery());
 };
diff --git a/rust/streamql/src/lib.rs b/rust/streamql/src/lib.rs
index bdc707f..ef6b9bd 100644
--- a/rust/streamql/src/lib.rs
+++ b/rust/streamql/src/lib.rs
@@ -33,6 +33,7 @@ mod tests {
     #[case(2)]
     #[case(3)]
     #[case(4)]
+    #[case(5)]
     fn test_ast(#[case] case: u32) {
         let input =
             std::fs::read_to_string(format!("../../tests/streamql/ast/{case}/input.streamql"))
diff --git a/tests/streamql/ast/5/input.streamql b/tests/streamql/ast/5/input.streamql
new file mode 100644
index 0000000..014c4a4
--- /dev/null
+++ b/tests/streamql/ast/5/input.streamql
@@ -0,0 +1 @@
+ws.len.gte:1212 AND stream.port.lt:8080
\ No newline at end of file
diff --git a/tests/streamql/ast/5/output.ast b/tests/streamql/ast/5/output.ast
new file mode 100644
index 0000000..9892a31
--- /dev/null
+++ b/tests/streamql/ast/5/output.ast
@@ -0,0 +1 @@
+(ws.len.gte:1212 and stream.port.lt:8080)
\ No newline at end of file