From 21cac2d9bac5a57c7dddad5fc3ce00e80629d868 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Sat, 28 Feb 2026 00:09:35 +0700
Subject: [PATCH 01/38] fix: Use contains operator for merchant filter in
 advanced search

Switch merchant filter from : (eq) to *: (contains) operator to preserve
partial-matching UX when backend starts respecting eq vs contains distinction.

Changes:
- Add *: operator support to parser grammar (baseRules.peggy)
- Regenerate searchParser.js and autocompleteParser.js
- Update buildQueryStringFromFilterFormValues to use *: for merchant
- Update unit test expectations

Fixes https://github.com/Expensify/App/issues/80823
---
 src/libs/SearchParser/autocompleteParser.js | 3269 ++++++-------------
 src/libs/SearchParser/baseRules.peggy       |    5 +-
 src/libs/SearchParser/searchParser.js       | 1706 +++++-----
 src/libs/SearchQueryUtils.ts                |    6 +-
 tests/unit/Search/SearchQueryUtilsTest.ts   |    4 +-
 5 files changed, 1828 insertions(+), 3162 deletions(-)

diff --git a/src/libs/SearchParser/autocompleteParser.js b/src/libs/SearchParser/autocompleteParser.js
index e70056f0d519..aed140261dfa 100644
--- a/src/libs/SearchParser/autocompleteParser.js
+++ b/src/libs/SearchParser/autocompleteParser.js
@@ -1,7 +1,7 @@
 'worklet'
 
 class peg$SyntaxError{}
-// @generated by Peggy 4.0.3.
+// @generated by Peggy 5.0.6.
 //
 // https://peggyjs.org/
 
@@ -11,598 +11,494 @@ class peg$SyntaxError{}
 // To make changes, edit the corresponding *.peggy files only.
 // Use the `generate-search-parser` and `generate-autocomplete-parser` scripts to regenerate parsers after modifications.
 
-function peg$subclass(child, parent) {
-  function C() { this.constructor = child; }
-  C.prototype = parent.prototype;
-  child.prototype = new C();
-}
-
-function temporary(message, expected, found, location) {
-  var self = Error.call(this, message);
-  // istanbul ignore next Check is a necessary evil to support older environments
-  if (Object.setPrototypeOf) {
-    Object.setPrototypeOf(self, peg$SyntaxError.prototype);
-  }
-  self.expected = expected;
-  self.found = found;
-  self.location = location;
-  self.name = "SyntaxError";
-  return self;
-}
-
-
-
-function peg$padEnd(str, targetLength, padString) {
-  padString = padString || " ";
-  if (str.length > targetLength) { return str; }
-  targetLength -= str.length;
-  padString += padString.repeat(targetLength);
-  return str + padString.slice(0, targetLength);
-}
+class peg$SyntaxError extends SyntaxError {
+  constructor(message, expected, found, location) {
+    super(message);
+    this.expected = expected;
+    this.found = found;
+    this.location = location;
+    this.name = "SyntaxError";
+  }
+
+  format(sources) {
+    let str = "Error: " + this.message;
+    if (this.location) {
+      let src = null;
+      const st = sources.find(s => s.source === this.location.source);
+      if (st) {
+        src = st.text.split(/\r\n|\n|\r/g);
+      }
+      const s = this.location.start;
+      const offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
+        ? this.location.source.offset(s)
+        : s;
+      const loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
+      if (src) {
+        const e = this.location.end;
+        const filler = "".padEnd(offset_s.line.toString().length, " ");
+        const line = src[s.line - 1];
+        const last = s.line === e.line ? e.column : line.length + 1;
+        const hatLen = (last - s.column) || 1;
+        str += "\n --> " + loc + "\n"
+            + filler + " |\n"
+            + offset_s.line + " | " + line + "\n"
+            + filler + " | " + "".padEnd(s.column - 1, " ")
+            + "".padEnd(hatLen, "^");
+      } else {
+        str += "\n at " + loc;
+      }
+    }
+    return str;
+  }
+
+  static buildMessage(expected, found) {
+    function hex(ch) {
+      return ch.codePointAt(0).toString(16).toUpperCase();
+    }
+
+    const nonPrintable = Object.prototype.hasOwnProperty.call(RegExp.prototype, "unicode")
+      ? new RegExp("[\\p{C}\\p{Mn}\\p{Mc}]", "gu")
+      : null;
+    function unicodeEscape(s) {
+      if (nonPrintable) {
+        return s.replace(nonPrintable,  ch => "\\u{" + hex(ch) + "}");
+      }
+      return s;
+    }
+
+    function literalEscape(s) {
+      return unicodeEscape(s
+        .replace(/\\/g, "\\\\")
+        .replace(/"/g,  "\\\"")
+        .replace(/\0/g, "\\0")
+        .replace(/\t/g, "\\t")
+        .replace(/\n/g, "\\n")
+        .replace(/\r/g, "\\r")
+        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
+        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
+    }
+
+    function classEscape(s) {
+      return unicodeEscape(s
+        .replace(/\\/g, "\\\\")
+        .replace(/\]/g, "\\]")
+        .replace(/\^/g, "\\^")
+        .replace(/-/g,  "\\-")
+        .replace(/\0/g, "\\0")
+        .replace(/\t/g, "\\t")
+        .replace(/\n/g, "\\n")
+        .replace(/\r/g, "\\r")
+        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
+        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
+    }
+
+    const DESCRIBE_EXPECTATION_FNS = {
+      literal(expectation) {
+        return "\"" + literalEscape(expectation.text) + "\"";
+      },
 
-peg$SyntaxError.prototype.format = function(sources) {
-  var str = "Error: " + this.message;
-  if (this.location) {
-    var src = null;
-    var k;
-    for (k = 0; k < sources.length; k++) {
-      if (sources[k].source === this.location.source) {
-        src = sources[k].text.split(/\r\n|\n|\r/g);
-        break;
-      }
-    }
-    var s = this.location.start;
-    var offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
-      ? this.location.source.offset(s)
-      : s;
-    var loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
-    if (src) {
-      var e = this.location.end;
-      var filler = peg$padEnd("", offset_s.line.toString().length, ' ');
-      var line = src[s.line - 1];
-      var last = s.line === e.line ? e.column : line.length + 1;
-      var hatLen = (last - s.column) || 1;
-      str += "\n --> " + loc + "\n"
-          + filler + " |\n"
-          + offset_s.line + " | " + line + "\n"
-          + filler + " | " + peg$padEnd("", s.column - 1, ' ')
-          + peg$padEnd("", hatLen, "^");
-    } else {
-      str += "\n at " + loc;
-    }
-  }
-  return str;
-};
+      class(expectation) {
+        const escapedParts = expectation.parts.map(
+          part => (Array.isArray(part)
+            ? classEscape(part[0]) + "-" + classEscape(part[1])
+            : classEscape(part))
+        );
 
-peg$SyntaxError.buildMessage = function(expected, found) {
-  var DESCRIBE_EXPECTATION_FNS = {
-    literal: function(expectation) {
-      return "\"" + literalEscape(expectation.text) + "\"";
-    },
-
-    class: function(expectation) {
-      var escapedParts = expectation.parts.map(function(part) {
-        return Array.isArray(part)
-          ? classEscape(part[0]) + "-" + classEscape(part[1])
-          : classEscape(part);
-      });
+        return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]" + (expectation.unicode ? "u" : "");
+      },
 
-      return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]";
-    },
+      any() {
+        return "any character";
+      },
 
-    any: function() {
-      return "any character";
-    },
+      end() {
+        return "end of input";
+      },
 
-    end: function() {
-      return "end of input";
-    },
+      other(expectation) {
+        return expectation.description;
+      },
+    };
 
-    other: function(expectation) {
-      return expectation.description;
+    function describeExpectation(expectation) {
+      return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
     }
-  };
-
-  function hex(ch) {
-    return ch.charCodeAt(0).toString(16).toUpperCase();
-  }
 
-  function literalEscape(s) {
-    return s
-      .replace(/\\/g, "\\\\")
-      .replace(/"/g,  "\\\"")
-      .replace(/\0/g, "\\0")
-      .replace(/\t/g, "\\t")
-      .replace(/\n/g, "\\n")
-      .replace(/\r/g, "\\r")
-      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
-      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
-  }
-
-  function classEscape(s) {
-    return s
-      .replace(/\\/g, "\\\\")
-      .replace(/\]/g, "\\]")
-      .replace(/\^/g, "\\^")
-      .replace(/-/g,  "\\-")
-      .replace(/\0/g, "\\0")
-      .replace(/\t/g, "\\t")
-      .replace(/\n/g, "\\n")
-      .replace(/\r/g, "\\r")
-      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
-      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
-  }
+    function describeExpected(expected) {
+      const descriptions = expected.map(describeExpectation);
+      descriptions.sort();
 
-  function describeExpectation(expectation) {
-    return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
-  }
+      if (descriptions.length > 0) {
+        let j = 1;
+        for (let i = 1; i < descriptions.length; i++) {
+          if (descriptions[i - 1] !== descriptions[i]) {
+            descriptions[j] = descriptions[i];
+            j++;
+          }
+        }
+        descriptions.length = j;
+      }
 
-  function describeExpected(expected) {
-    var descriptions = expected.map(describeExpectation);
-    var i, j;
+      switch (descriptions.length) {
+        case 1:
+          return descriptions[0];
 
-    descriptions.sort();
+        case 2:
+          return descriptions[0] + " or " + descriptions[1];
 
-    if (descriptions.length > 0) {
-      for (i = 1, j = 1; i < descriptions.length; i++) {
-        if (descriptions[i - 1] !== descriptions[i]) {
-          descriptions[j] = descriptions[i];
-          j++;
-        }
+        default:
+          return descriptions.slice(0, -1).join(", ")
+            + ", or "
+            + descriptions[descriptions.length - 1];
       }
-      descriptions.length = j;
     }
 
-    switch (descriptions.length) {
-      case 1:
-        return descriptions[0];
-
-      case 2:
-        return descriptions[0] + " or " + descriptions[1];
-
-      default:
-        return descriptions.slice(0, -1).join(", ")
-          + ", or "
-          + descriptions[descriptions.length - 1];
+    function describeFound(found) {
+      return found ? "\"" + literalEscape(found) + "\"" : "end of input";
     }
-  }
 
-  function describeFound(found) {
-    return found ? "\"" + literalEscape(found) + "\"" : "end of input";
+    return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
   }
-
-  return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
-};
+}
 
 function peg$parse(input, options) {
   options = options !== undefined ? options : {};
 
-  var peg$FAILED = {};
-  var peg$source = options.grammarSource;
-
-  var peg$startRuleFunctions = { query: peg$parsequery };
-  var peg$startRuleFunction = peg$parsequery;
-
-  var peg$c0 = "-";
-  var peg$c1 = "report-field";
-  var peg$c2 = "reportfield";
-  var peg$c3 = ",";
-  var peg$c4 = "date";
-  var peg$c5 = "amount";
-  var peg$c6 = "merchant";
-  var peg$c7 = "description";
-  var peg$c8 = "reportid";
-  var peg$c9 = "report-id";
-  var peg$c10 = "keyword";
-  var peg$c11 = "in";
-  var peg$c12 = "currency";
-  var peg$c13 = "groupCurrency";
-  var peg$c14 = "group-currency";
-  var peg$c15 = "tag";
-  var peg$c16 = "category";
-  var peg$c17 = "to";
-  var peg$c18 = "exporter";
-  var peg$c19 = "payer";
-  var peg$c20 = "taxrate";
-  var peg$c21 = "tax-rate";
-  var peg$c22 = "cardID";
-  var peg$c23 = "card";
-  var peg$c24 = "from";
-  var peg$c25 = "attendee";
-  var peg$c26 = "expenseType";
-  var peg$c27 = "expense-type";
-  var peg$c28 = "withdrawalType";
-  var peg$c29 = "withdrawal-type";
-  var peg$c30 = "withdrawalid";
-  var peg$c31 = "withdrawal-id";
-  var peg$c32 = "billable";
-  var peg$c33 = "reimbursable";
-  var peg$c34 = "type";
-  var peg$c35 = "status";
-  var peg$c36 = "sortBy";
-  var peg$c37 = "sort-by";
-  var peg$c38 = "sortOrder";
-  var peg$c39 = "sort-order";
-  var peg$c40 = "policyID";
-  var peg$c41 = "workspace";
-  var peg$c42 = "submitted";
-  var peg$c43 = "approved";
-  var peg$c44 = "paid";
-  var peg$c45 = "exported";
-  var peg$c46 = "posted";
-  var peg$c47 = "withdrawn";
-  var peg$c48 = "groupby";
-  var peg$c49 = "group-by";
-  var peg$c50 = "limit";
-  var peg$c51 = "feed";
-  var peg$c52 = "title";
-  var peg$c53 = "assignee";
-  var peg$c54 = "createdby";
-  var peg$c55 = "created-by";
-  var peg$c56 = "action";
-  var peg$c57 = "total";
-  var peg$c58 = "has";
-  var peg$c59 = "is";
-  var peg$c60 = "purchaseamount";
-  var peg$c61 = "purchase-amount";
-  var peg$c62 = "purchasecurrency";
-  var peg$c63 = "purchase-currency";
-  var peg$c64 = "columns";
-  var peg$c65 = "view";
-  var peg$c66 = "per-diem";
-  var peg$c67 = "drafts";
-  var peg$c68 = "draft";
-  var peg$c69 = "original-amount";
-  var peg$c70 = "tax";
-  var peg$c71 = "policy-name";
-  var peg$c72 = "bank-account";
-  var peg$c73 = "long-report-id";
-  var peg$c74 = "exported-to";
-  var peg$c75 = "exportedto";
-  var peg$c76 = "exchange-rate";
-  var peg$c77 = "reimbursable-total";
-  var peg$c78 = "non-reimbursable-total";
-  var peg$c79 = "group-from";
-  var peg$c80 = "group-expenses";
-  var peg$c81 = "group-total";
-  var peg$c82 = "group-card";
-  var peg$c83 = "group-feed";
-  var peg$c84 = "group-bank-account";
-  var peg$c85 = "group-withdrawn";
-  var peg$c86 = "group-withdrawal-id";
-  var peg$c87 = "group-category";
-  var peg$c88 = "group-tag";
-  var peg$c89 = "group-merchant";
-  var peg$c90 = "group-month";
-  var peg$c91 = "group-week";
-  var peg$c92 = "group-year";
-  var peg$c93 = "group-quarter";
-  var peg$c94 = "!=";
-  var peg$c95 = ">=";
-  var peg$c96 = ">";
-  var peg$c97 = "<=";
-  var peg$c98 = "<";
-  var peg$c99 = "\u201C";
-  var peg$c100 = "\u201D";
-  var peg$c101 = "\"";
-
-  var peg$r0 = /^[ \t\r\n\xA0,:=<>!]/;
-  var peg$r1 = /^[:=]/;
-  var peg$r2 = /^[^ ,\t\n\r\xA0]/;
-  var peg$r3 = /^[ \t\r\n\xA0]/;
-  var peg$r4 = /^[^ ,"\u201D\u201C\t\n\r\xA0]/;
-  var peg$r5 = /^["\u201C-\u201D]/;
-  var peg$r6 = /^[^"\u201D\u201C\r\n]/;
-  var peg$r7 = /^[ \t\n\r\xA0a-zA-Z0-9]/;
-  var peg$r8 = /^[a-zA-Z0-9]/;
-  var peg$r9 = /^[ \t\n\r\xA0]/;
-  var peg$r10 = /^[ \t\n\r\xA0a-zA-Z]/;
-  var peg$r11 = /^[,]/;
-  var peg$r12 = /^[ \t\n\r\xA0,]/;
-
-  var peg$e0 = peg$literalExpectation("-", false);
-  var peg$e1 = peg$literalExpectation("report-field", true);
-  var peg$e2 = peg$literalExpectation("reportfield", true);
-  var peg$e3 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0", ",", ":", "=", "<", ">", "!"], false, false);
-  var peg$e4 = peg$anyExpectation();
-  var peg$e5 = peg$literalExpectation(",", false);
-  var peg$e6 = peg$otherExpectation("key");
-  var peg$e7 = peg$literalExpectation("date", true);
-  var peg$e8 = peg$literalExpectation("amount", true);
-  var peg$e9 = peg$literalExpectation("merchant", true);
-  var peg$e10 = peg$literalExpectation("description", true);
-  var peg$e11 = peg$literalExpectation("reportid", true);
-  var peg$e12 = peg$literalExpectation("report-id", true);
-  var peg$e13 = peg$literalExpectation("keyword", true);
-  var peg$e14 = peg$literalExpectation("in", true);
-  var peg$e15 = peg$literalExpectation("currency", true);
-  var peg$e16 = peg$literalExpectation("groupCurrency", false);
-  var peg$e17 = peg$literalExpectation("group-currency", true);
-  var peg$e18 = peg$literalExpectation("tag", true);
-  var peg$e19 = peg$literalExpectation("category", true);
-  var peg$e20 = peg$literalExpectation("to", true);
-  var peg$e21 = peg$literalExpectation("exporter", true);
-  var peg$e22 = peg$literalExpectation("payer", true);
-  var peg$e23 = peg$literalExpectation("taxRate", true);
-  var peg$e24 = peg$literalExpectation("tax-rate", true);
-  var peg$e25 = peg$literalExpectation("cardID", false);
-  var peg$e26 = peg$literalExpectation("card", true);
-  var peg$e27 = peg$literalExpectation("from", true);
-  var peg$e28 = peg$literalExpectation("attendee", true);
-  var peg$e29 = peg$literalExpectation("expenseType", false);
-  var peg$e30 = peg$literalExpectation("expense-type", true);
-  var peg$e31 = peg$literalExpectation("withdrawalType", false);
-  var peg$e32 = peg$literalExpectation("withdrawal-type", true);
-  var peg$e33 = peg$literalExpectation("withdrawalID", true);
-  var peg$e34 = peg$literalExpectation("withdrawal-id", true);
-  var peg$e35 = peg$literalExpectation("billable", true);
-  var peg$e36 = peg$literalExpectation("reimbursable", true);
-  var peg$e37 = peg$literalExpectation("type", true);
-  var peg$e38 = peg$literalExpectation("status", true);
-  var peg$e39 = peg$literalExpectation("sortBy", false);
-  var peg$e40 = peg$literalExpectation("sort-by", true);
-  var peg$e41 = peg$literalExpectation("sortOrder", false);
-  var peg$e42 = peg$literalExpectation("sort-order", true);
-  var peg$e43 = peg$literalExpectation("policyID", false);
-  var peg$e44 = peg$literalExpectation("workspace", true);
-  var peg$e45 = peg$literalExpectation("submitted", true);
-  var peg$e46 = peg$literalExpectation("approved", true);
-  var peg$e47 = peg$literalExpectation("paid", true);
-  var peg$e48 = peg$literalExpectation("exported", true);
-  var peg$e49 = peg$literalExpectation("posted", true);
-  var peg$e50 = peg$literalExpectation("withdrawn", true);
-  var peg$e51 = peg$literalExpectation("groupBy", true);
-  var peg$e52 = peg$literalExpectation("group-by", true);
-  var peg$e53 = peg$literalExpectation("limit", true);
-  var peg$e54 = peg$literalExpectation("feed", true);
-  var peg$e55 = peg$literalExpectation("title", true);
-  var peg$e56 = peg$literalExpectation("assignee", true);
-  var peg$e57 = peg$literalExpectation("createdBy", true);
-  var peg$e58 = peg$literalExpectation("created-by", true);
-  var peg$e59 = peg$literalExpectation("action", true);
-  var peg$e60 = peg$literalExpectation("total", true);
-  var peg$e61 = peg$literalExpectation("has", true);
-  var peg$e62 = peg$literalExpectation("is", true);
-  var peg$e63 = peg$literalExpectation("purchaseAmount", true);
-  var peg$e64 = peg$literalExpectation("purchase-amount", true);
-  var peg$e65 = peg$literalExpectation("purchaseCurrency", true);
-  var peg$e66 = peg$literalExpectation("purchase-currency", true);
-  var peg$e67 = peg$literalExpectation("columns", true);
-  var peg$e68 = peg$literalExpectation("view", true);
-  var peg$e69 = peg$literalExpectation("per-diem", true);
-  var peg$e70 = peg$literalExpectation("drafts", true);
-  var peg$e71 = peg$literalExpectation("draft", true);
-  var peg$e72 = peg$literalExpectation("original-amount", true);
-  var peg$e73 = peg$literalExpectation("tax", true);
-  var peg$e74 = peg$literalExpectation("policy-name", true);
-  var peg$e75 = peg$literalExpectation("bank-account", true);
-  var peg$e76 = peg$literalExpectation("long-report-id", true);
-  var peg$e77 = peg$literalExpectation("exported-to", true);
-  var peg$e78 = peg$classExpectation([":", "="], false, false);
-  var peg$e79 = peg$literalExpectation("exportedTo", true);
-  var peg$e80 = peg$literalExpectation("exchange-rate", true);
-  var peg$e81 = peg$literalExpectation("reimbursable-total", true);
-  var peg$e82 = peg$literalExpectation("non-reimbursable-total", true);
-  var peg$e83 = peg$literalExpectation("group-from", true);
-  var peg$e84 = peg$literalExpectation("group-expenses", true);
-  var peg$e85 = peg$literalExpectation("group-total", true);
-  var peg$e86 = peg$literalExpectation("group-card", true);
-  var peg$e87 = peg$literalExpectation("group-feed", true);
-  var peg$e88 = peg$literalExpectation("group-bank-account", true);
-  var peg$e89 = peg$literalExpectation("group-withdrawn", true);
-  var peg$e90 = peg$literalExpectation("group-withdrawal-id", true);
-  var peg$e91 = peg$literalExpectation("group-category", true);
-  var peg$e92 = peg$literalExpectation("group-tag", true);
-  var peg$e93 = peg$literalExpectation("group-merchant", true);
-  var peg$e94 = peg$literalExpectation("group-month", true);
-  var peg$e95 = peg$literalExpectation("group-week", true);
-  var peg$e96 = peg$literalExpectation("group-year", true);
-  var peg$e97 = peg$literalExpectation("group-quarter", true);
-  var peg$e98 = peg$otherExpectation("operator");
-  var peg$e99 = peg$literalExpectation("!=", false);
-  var peg$e100 = peg$literalExpectation(">=", false);
-  var peg$e101 = peg$literalExpectation(">", false);
-  var peg$e102 = peg$literalExpectation("<=", false);
-  var peg$e103 = peg$literalExpectation("<", false);
-  var peg$e104 = peg$otherExpectation("word");
-  var peg$e105 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e106 = peg$otherExpectation("whitespace");
-  var peg$e107 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
-  var peg$e108 = peg$otherExpectation("quote");
-  var peg$e109 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e110 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
-  var peg$e111 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
-  var peg$e112 = peg$literalExpectation("\u201C", false);
-  var peg$e113 = peg$literalExpectation("\u201D", false);
-  var peg$e114 = peg$literalExpectation("\"", false);
-  var peg$e115 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e116 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e117 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
-  var peg$e118 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
-  var peg$e119 = peg$classExpectation([","], false, false);
-  var peg$e120 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false);
-
-  var peg$f0 = function(ranges) { return { autocomplete, ranges }; };
-  var peg$f1 = function(filters) { return filters.filter(Boolean).flat(); };
-  var peg$f2 = function(neg, key, op, value) {
-      expectingNestedQuote = false; nameOperator = false; // Reset string parser
-
-      const isNegated = !!neg && !nonNegatableKeys.has(key);
-
-      if (!value) {
-        autocomplete = {
-          key,
-          negated: isNegated,
-          value: "",
-          start: location().end.offset,
-          length: 0,
-        };
-        return;
-      }
+  const peg$FAILED = {};
+  const peg$source = options.grammarSource;
 
+  const peg$startRuleFunctions = {
+    query: peg$parsequery,
+  };
+  let peg$startRuleFunction = peg$parsequery;
+
+  const peg$c0 = "-";
+  const peg$c1 = "report-field";
+  const peg$c2 = "reportfield";
+  const peg$c3 = ",";
+  const peg$c4 = "date";
+  const peg$c5 = "amount";
+  const peg$c6 = "merchant";
+  const peg$c7 = "description";
+  const peg$c8 = "reportid";
+  const peg$c9 = "report-id";
+  const peg$c10 = "in";
+  const peg$c11 = "currency";
+  const peg$c12 = "groupCurrency";
+  const peg$c13 = "group-currency";
+  const peg$c14 = "tag";
+  const peg$c15 = "category";
+  const peg$c16 = "to";
+  const peg$c17 = "exporter";
+  const peg$c18 = "payer";
+  const peg$c19 = "taxrate";
+  const peg$c20 = "tax-rate";
+  const peg$c21 = "cardID";
+  const peg$c22 = "card";
+  const peg$c23 = "from";
+  const peg$c24 = "attendee";
+  const peg$c25 = "expenseType";
+  const peg$c26 = "expense-type";
+  const peg$c27 = "withdrawalType";
+  const peg$c28 = "withdrawal-type";
+  const peg$c29 = "withdrawalid";
+  const peg$c30 = "withdrawal-id";
+  const peg$c31 = "billable";
+  const peg$c32 = "reimbursable";
+  const peg$c33 = "type";
+  const peg$c34 = "status";
+  const peg$c35 = "policyID";
+  const peg$c36 = "workspace";
+  const peg$c37 = "submitted";
+  const peg$c38 = "approved";
+  const peg$c39 = "paid";
+  const peg$c40 = "exported";
+  const peg$c41 = "posted";
+  const peg$c42 = "withdrawn";
+  const peg$c43 = "groupby";
+  const peg$c44 = "group-by";
+  const peg$c45 = "limit";
+  const peg$c46 = "feed";
+  const peg$c47 = "title";
+  const peg$c48 = "assignee";
+  const peg$c49 = "createdby";
+  const peg$c50 = "created-by";
+  const peg$c51 = "action";
+  const peg$c52 = "total";
+  const peg$c53 = "has";
+  const peg$c54 = "is";
+  const peg$c55 = "purchaseamount";
+  const peg$c56 = "purchase-amount";
+  const peg$c57 = "purchasecurrency";
+  const peg$c58 = "purchase-currency";
+  const peg$c59 = "columns";
+  const peg$c60 = "view";
+  const peg$c61 = "exportedto";
+  const peg$c62 = "exported-to";
+  const peg$c63 = "*:";
+  const peg$c64 = "!=";
+  const peg$c65 = ">=";
+  const peg$c66 = ">";
+  const peg$c67 = "<=";
+  const peg$c68 = "<";
+  const peg$c69 = "\u201C";
+  const peg$c70 = "\u201D";
+  const peg$c71 = "\"";
+
+  const peg$r0 = /^[ \t\r\n\xA0,:=<>!]/;
+  const peg$r1 = /^[:=]/;
+  const peg$r2 = /^[^ ,\t\n\r\xA0]/;
+  const peg$r3 = /^[ \t\r\n\xA0]/;
+  const peg$r4 = /^[^ ,"\u201D\u201C\t\n\r\xA0]/;
+  const peg$r5 = /^["\u201C-\u201D]/;
+  const peg$r6 = /^[^"\u201D\u201C\r\n]/;
+  const peg$r7 = /^[ \t\n\r\xA0a-zA-Z0-9]/;
+  const peg$r8 = /^[a-zA-Z0-9]/;
+  const peg$r9 = /^[ \t\n\r\xA0]/;
+  const peg$r10 = /^[ \t\n\r\xA0a-zA-Z]/;
+  const peg$r11 = /^[,]/;
+  const peg$r12 = /^[ \t\n\r\xA0,]/;
+
+  const peg$e0 = peg$literalExpectation("-", false);
+  const peg$e1 = peg$literalExpectation("report-field", true);
+  const peg$e2 = peg$literalExpectation("reportfield", true);
+  const peg$e3 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0", ",", ":", "=", "<", ">", "!"], false, false, false);
+  const peg$e4 = peg$anyExpectation();
+  const peg$e5 = peg$literalExpectation(",", false);
+  const peg$e6 = peg$otherExpectation("key");
+  const peg$e7 = peg$literalExpectation("date", true);
+  const peg$e8 = peg$literalExpectation("amount", true);
+  const peg$e9 = peg$literalExpectation("merchant", true);
+  const peg$e10 = peg$literalExpectation("description", true);
+  const peg$e11 = peg$literalExpectation("reportid", true);
+  const peg$e12 = peg$literalExpectation("report-id", true);
+  const peg$e13 = peg$literalExpectation("in", true);
+  const peg$e14 = peg$literalExpectation("currency", true);
+  const peg$e15 = peg$literalExpectation("groupCurrency", false);
+  const peg$e16 = peg$literalExpectation("group-currency", true);
+  const peg$e17 = peg$literalExpectation("tag", true);
+  const peg$e18 = peg$literalExpectation("category", true);
+  const peg$e19 = peg$literalExpectation("to", true);
+  const peg$e20 = peg$literalExpectation("exporter", true);
+  const peg$e21 = peg$literalExpectation("payer", true);
+  const peg$e22 = peg$literalExpectation("taxRate", true);
+  const peg$e23 = peg$literalExpectation("tax-rate", true);
+  const peg$e24 = peg$literalExpectation("cardID", false);
+  const peg$e25 = peg$literalExpectation("card", true);
+  const peg$e26 = peg$literalExpectation("from", true);
+  const peg$e27 = peg$literalExpectation("attendee", true);
+  const peg$e28 = peg$literalExpectation("expenseType", false);
+  const peg$e29 = peg$literalExpectation("expense-type", true);
+  const peg$e30 = peg$literalExpectation("withdrawalType", false);
+  const peg$e31 = peg$literalExpectation("withdrawal-type", true);
+  const peg$e32 = peg$literalExpectation("withdrawalID", true);
+  const peg$e33 = peg$literalExpectation("withdrawal-id", true);
+  const peg$e34 = peg$literalExpectation("billable", true);
+  const peg$e35 = peg$literalExpectation("reimbursable", true);
+  const peg$e36 = peg$literalExpectation("type", true);
+  const peg$e37 = peg$literalExpectation("status", true);
+  const peg$e38 = peg$literalExpectation("policyID", false);
+  const peg$e39 = peg$literalExpectation("workspace", true);
+  const peg$e40 = peg$literalExpectation("submitted", true);
+  const peg$e41 = peg$literalExpectation("approved", true);
+  const peg$e42 = peg$literalExpectation("paid", true);
+  const peg$e43 = peg$literalExpectation("exported", true);
+  const peg$e44 = peg$literalExpectation("posted", true);
+  const peg$e45 = peg$literalExpectation("withdrawn", true);
+  const peg$e46 = peg$literalExpectation("groupBy", true);
+  const peg$e47 = peg$literalExpectation("group-by", true);
+  const peg$e48 = peg$literalExpectation("limit", true);
+  const peg$e49 = peg$literalExpectation("feed", true);
+  const peg$e50 = peg$literalExpectation("title", true);
+  const peg$e51 = peg$literalExpectation("assignee", true);
+  const peg$e52 = peg$literalExpectation("createdBy", true);
+  const peg$e53 = peg$literalExpectation("created-by", true);
+  const peg$e54 = peg$literalExpectation("action", true);
+  const peg$e55 = peg$literalExpectation("total", true);
+  const peg$e56 = peg$literalExpectation("has", true);
+  const peg$e57 = peg$literalExpectation("is", true);
+  const peg$e58 = peg$literalExpectation("purchaseAmount", true);
+  const peg$e59 = peg$literalExpectation("purchase-amount", true);
+  const peg$e60 = peg$literalExpectation("purchaseCurrency", true);
+  const peg$e61 = peg$literalExpectation("purchase-currency", true);
+  const peg$e62 = peg$literalExpectation("columns", true);
+  const peg$e63 = peg$literalExpectation("view", true);
+  const peg$e64 = peg$classExpectation([":", "="], false, false, false);
+  const peg$e65 = peg$literalExpectation("exportedTo", true);
+  const peg$e66 = peg$literalExpectation("exported-to", true);
+  const peg$e67 = peg$otherExpectation("operator");
+  const peg$e68 = peg$literalExpectation("*:", false);
+  const peg$e69 = peg$literalExpectation("!=", false);
+  const peg$e70 = peg$literalExpectation(">=", false);
+  const peg$e71 = peg$literalExpectation(">", false);
+  const peg$e72 = peg$literalExpectation("<=", false);
+  const peg$e73 = peg$literalExpectation("<", false);
+  const peg$e74 = peg$otherExpectation("word");
+  const peg$e75 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false, false);
+  const peg$e76 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false, false);
+  const peg$e77 = peg$otherExpectation("quote");
+  const peg$e78 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false, false);
+  const peg$e79 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false, false);
+  const peg$e80 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false, false);
+  const peg$e81 = peg$literalExpectation("\u201C", false);
+  const peg$e82 = peg$literalExpectation("\u201D", false);
+  const peg$e83 = peg$literalExpectation("\"", false);
+  const peg$e84 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false, false);
+  const peg$e85 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false, false);
+  const peg$e86 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false, false);
+  const peg$e87 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false, false);
+  const peg$e88 = peg$classExpectation([","], false, false, false);
+  const peg$e89 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false, false);
+
+  function peg$f0(ranges) {    return { autocomplete, ranges };  }
+  function peg$f1(filters) {    return filters.filter(Boolean).flat();  }
+  function peg$f2(neg, key, op, value) {
+    expectingNestedQuote = false; nameOperator = false; // Reset string parser
+
+    const isNegated = !!neg && !nonNegatableKeys.has(key);
+
+    if (!value) {
       autocomplete = {
         key,
         negated: isNegated,
-        ...value[value.length - 1],
+        value: "",
+        start: location().end.offset,
+        length: 0,
       };
-      return value
-        .filter((v) => v.length > 0)
-        .map((v) => ({
-          key,
-          negated: isNegated,
-          ...v,
-        }));
-    };
-  var peg$f3 = function(rest) {
-      const suffix = rest.replaceAll(/^-+/g, "");
-      return "reportField-" + (suffix ? suffix : "");
-    };
-  var peg$f4 = function() { autocomplete = null; };
-  var peg$f5 = function(k) {
-      nameOperator = (k === "from" || k === "to" || k === "payer" || k === "exporter" || k === "attendee" || k === "createdBy" || k === "assignee");
-      return k;
+      return;
+    }
+
+    autocomplete = {
+      key,
+      negated: isNegated,
+      ...value[value.length - 1],
     };
-  var peg$f6 = function(parts, empty) {
-      const ends = location();
-      const value = parts.flat().filter(Boolean); // Filter out undefined values returned by the predicate
-      if (empty) {
-        value.push("");
-      }
-      let count = ends.start.offset;
-      const result = [];
-      value.forEach((filter) => {
-        let word = filter;
-        if (word.startsWith('"') && word.endsWith('"') && word.length >= 2) {
-          word = word.slice(1, -1);
-        }
-        result.push({
-          value: word,
-          start: count,
-          length: filter.length,
-        });
-        count += filter.length + 1;
+    return value
+      .filter((v) => v.length > 0)
+      .map((v) => ({
+        key,
+        negated: isNegated,
+        ...v,
+      }));
+  }
+  function peg$f3(rest) {
+    const suffix = rest.replaceAll(/^-+/g, "");
+    return "reportField-" + (suffix ? suffix : "");
+  }
+  function peg$f4() {    autocomplete = null;  }
+  function peg$f5(k) {
+    nameOperator = (k === "from" || k === "to" || k === "payer" || k === "exporter" || k === "attendee" || k === "createdBy" || k === "assignee");
+    return k;
+  }
+  function peg$f6(parts, empty) {
+    const ends = location();
+    const value = parts.flat().filter(Boolean); // Filter out undefined values returned by the predicate
+    if (empty) {
+      value.push("");
+    }
+    let count = ends.start.offset;
+    const result = [];
+    value.forEach((filter) => {
+      let word = filter;
+      if (word.startsWith('"') && word.endsWith('"') && word.length >= 2) {
+        word = word.slice(1, -1);
+      }
+      result.push({
+        value: word,
+        start: count,
+        length: filter.length,
       });
-      return result;
-    };
-  var peg$f7 = function() { return "date"; };
-  var peg$f8 = function() { return "amount"; };
-  var peg$f9 = function() { return "merchant"; };
-  var peg$f10 = function() { return "description"; };
-  var peg$f11 = function() { return "reportID"; };
-  var peg$f12 = function() { return "keyword"; };
-  var peg$f13 = function() { return "in"; };
-  var peg$f14 = function() { return "currency"; };
-  var peg$f15 = function() { return "groupCurrency"; };
-  var peg$f16 = function() { return "tag"; };
-  var peg$f17 = function() { return "category"; };
-  var peg$f18 = function() { return "to"; };
-  var peg$f19 = function() { return "exporter"; };
-  var peg$f20 = function() { return "payer"; };
-  var peg$f21 = function() { return "taxRate"; };
-  var peg$f22 = function() { return "cardID"; };
-  var peg$f23 = function() { return "from"; };
-  var peg$f24 = function() {return "attendee"};
-  var peg$f25 = function() { return "expenseType"; };
-  var peg$f26 = function() { return "withdrawalType"; };
-  var peg$f27 = function() { return "withdrawalID"; };
-  var peg$f28 = function() { return "billable"; };
-  var peg$f29 = function() { return "reimbursable"; };
-  var peg$f30 = function() { return "type"; };
-  var peg$f31 = function() { return "status"; };
-  var peg$f32 = function() { return "sortBy"; };
-  var peg$f33 = function() { return "sortOrder"; };
-  var peg$f34 = function() { return "policyID"; };
-  var peg$f35 = function() { return "submitted"; };
-  var peg$f36 = function() { return "approved"; };
-  var peg$f37 = function() { return "paid"; };
-  var peg$f38 = function() { return "exported"; };
-  var peg$f39 = function() { return "posted"; };
-  var peg$f40 = function() { return "withdrawn"; };
-  var peg$f41 = function() { return "groupBy"; };
-  var peg$f42 = function() { return "limit"; };
-  var peg$f43 = function() { return "feed"; };
-  var peg$f44 = function() { return "title"; };
-  var peg$f45 = function() { return "assignee"; };
-  var peg$f46 = function() { return "createdBy"; };
-  var peg$f47 = function() { return "action"; };
-  var peg$f48 = function() {return "total"; };
-  var peg$f49 = function() {return "has"; };
-  var peg$f50 = function() {return "is"; };
-  var peg$f51 = function() {return "purchaseAmount"};
-  var peg$f52 = function() {return "purchaseCurrency"};
-  var peg$f53 = function() {
-  isColumnsContext = true;
-  return "columns";
-};
-  var peg$f54 = function() {return "view"};
-  var peg$f55 = function() { return isColumnsContext; };
-  var peg$f56 = function() { return "perDiem"; };
-  var peg$f57 = function() { return "drafts"; };
-  var peg$f58 = function() { return "originalamount"; };
-  var peg$f59 = function() { return "taxAmount"; };
-  var peg$f60 = function() { return "taxrate"; };
-  var peg$f61 = function() { return "policyname"; };
-  var peg$f62 = function() { return "withdrawalID"; };
-  var peg$f63 = function() { return "bankAccount"; };
-  var peg$f64 = function() { return "reportID"; };
-  var peg$f65 = function() { return "base62ReportID"; };
-  var peg$f66 = function() { return "exportedto"; };
-  var peg$f67 = function() { return "exportedTo"; };
-  var peg$f68 = function() { return "exportedTo"; };
-  var peg$f69 = function() { return "exchangeRate"; };
-  var peg$f70 = function() { return "reimbursableTotal"; };
-  var peg$f71 = function() { return "nonReimbursableTotal"; };
-  var peg$f72 = function() { return "groupFrom"; };
-  var peg$f73 = function() { return "groupExpenses"; };
-  var peg$f74 = function() { return "groupTotal"; };
-  var peg$f75 = function() { return "groupCard"; };
-  var peg$f76 = function() { return "groupFeed"; };
-  var peg$f77 = function() { return "groupBankAccount"; };
-  var peg$f78 = function() { return "groupWithdrawn"; };
-  var peg$f79 = function() { return "groupWithdrawalID"; };
-  var peg$f80 = function() { return "groupCategory"; };
-  var peg$f81 = function() { return "groupTag"; };
-  var peg$f82 = function() { return "groupMerchant"; };
-  var peg$f83 = function() { return "groupmonth"; };
-  var peg$f84 = function() { return "groupweek"; };
-  var peg$f85 = function() { return "groupyear"; };
-  var peg$f86 = function() { return "groupquarter"; };
-  var peg$f87 = function() { return "eq"; };
-  var peg$f88 = function() { return "neq"; };
-  var peg$f89 = function() { return "gte"; };
-  var peg$f90 = function() { return "gt"; };
-  var peg$f91 = function() { return "lte"; };
-  var peg$f92 = function() { return "lt"; };
-  var peg$f93 = function(o) {
-      if (nameOperator) {
-        expectingNestedQuote = (o === "eq"); // Use simple parser if no valid operator is found
-      }
-      isColumnsContext = false;
-      return o;
-  };
-  var peg$f94 = function(chars) { return chars.join("").trim(); };
-  var peg$f95 = function() { 
-  isColumnsContext = false;
-  return "and";
-};
-  var peg$f96 = function() { return expectingNestedQuote; };
-  var peg$f97 = function(start, inner, end) { //handle no-breaking space
-      return [...start, '"', ...inner, '"', ...end].join("");
-    };
-  var peg$f98 = function(start) {return "“"};
-  var peg$f99 = function(start) {return "”"};
-  var peg$f100 = function(start) {return "\""};
-  var peg$f101 = function(start, inner, end) {
+      count += filter.length + 1;
+    });
+    return result;
+  }
+  function peg$f7() {    return "date";  }
+  function peg$f8() {    return "amount";  }
+  function peg$f9() {    return "merchant";  }
+  function peg$f10() {    return "description";  }
+  function peg$f11() {    return "reportID";  }
+  function peg$f12() {    return "in";  }
+  function peg$f13() {    return "currency";  }
+  function peg$f14() {    return "groupCurrency";  }
+  function peg$f15() {    return "tag";  }
+  function peg$f16() {    return "category";  }
+  function peg$f17() {    return "to";  }
+  function peg$f18() {    return "exporter";  }
+  function peg$f19() {    return "payer";  }
+  function peg$f20() {    return "taxRate";  }
+  function peg$f21() {    return "cardID";  }
+  function peg$f22() {    return "from";  }
+  function peg$f23() {return "attendee"  }
+  function peg$f24() {    return "expenseType";  }
+  function peg$f25() {    return "withdrawalType";  }
+  function peg$f26() {    return "withdrawalID";  }
+  function peg$f27() {    return "billable";  }
+  function peg$f28() {    return "reimbursable";  }
+  function peg$f29() {    return "type";  }
+  function peg$f30() {    return "status";  }
+  function peg$f31() {    return "policyID";  }
+  function peg$f32() {    return "submitted";  }
+  function peg$f33() {    return "approved";  }
+  function peg$f34() {    return "paid";  }
+  function peg$f35() {    return "exported";  }
+  function peg$f36() {    return "posted";  }
+  function peg$f37() {    return "withdrawn";  }
+  function peg$f38() {    return "groupBy";  }
+  function peg$f39() {    return "limit";  }
+  function peg$f40() {    return "feed";  }
+  function peg$f41() {    return "title";  }
+  function peg$f42() {    return "assignee";  }
+  function peg$f43() {    return "createdBy";  }
+  function peg$f44() {    return "action";  }
+  function peg$f45() {return "total";  }
+  function peg$f46() {return "has";  }
+  function peg$f47() {return "is";  }
+  function peg$f48() {return "purchaseAmount"  }
+  function peg$f49() {return "purchaseCurrency"  }
+  function peg$f50() {
+    isColumnsContext = true;
+    return "columns";
+  }
+  function peg$f51() {return "view"  }
+  function peg$f52() {    return "exportedTo";  }
+  function peg$f53() {    return "exportedTo";  }
+  function peg$f54() {    return "contains";  }
+  function peg$f55() {    return "eq";  }
+  function peg$f56() {    return "neq";  }
+  function peg$f57() {    return "gte";  }
+  function peg$f58() {    return "gt";  }
+  function peg$f59() {    return "lte";  }
+  function peg$f60() {    return "lt";  }
+  function peg$f61(o) {
+    if (nameOperator) {
+      expectingNestedQuote = (o === "eq" || o === "contains");
+    }
+    isColumnsContext = false;
+    return o;
+  }
+  function peg$f62(chars) {    return chars.join("").trim();  }
+  function peg$f63() {    
+     isColumnsContext = false;
+     return "and";
+  }
+  function peg$f64() {    return expectingNestedQuote;  }
+  function peg$f65(start, inner, end) {    //handle no-breaking space
+         return [...start, '"', ...inner, '"', ...end].join("");
+  }
+  function peg$f66(start) {return "“"  }
+  function peg$f67(start) {return "”"  }
+  function peg$f68(start) {return "\""  }
+  function peg$f69(start, inner, end) {
     return [...start, '"', ...inner, '"'].join("");
-};
-  var peg$currPos = options.peg$currPos | 0;
-  var peg$savedPos = peg$currPos;
-  var peg$posDetailsCache = [{ line: 1, column: 1 }];
-  var peg$maxFailPos = peg$currPos;
-  var peg$maxFailExpected = options.peg$maxFailExpected || [];
-  var peg$silentFails = options.peg$silentFails | 0;
+  }
+  let peg$currPos = options.peg$currPos | 0;
+  let peg$savedPos = peg$currPos;
+  const peg$posDetailsCache = [{ line: 1, column: 1 }];
+  let peg$maxFailPos = peg$currPos;
+  let peg$maxFailExpected = options.peg$maxFailExpected || [];
+  let peg$silentFails = options.peg$silentFails | 0;
 
-  var peg$result;
+  let peg$result;
 
   if (options.startRule) {
     if (!(options.startRule in peg$startRuleFunctions)) {
@@ -624,7 +520,7 @@ function peg$parse(input, options) {
     return {
       source: peg$source,
       start: peg$savedPos,
-      end: peg$currPos
+      end: peg$currPos,
     };
   }
 
@@ -652,12 +548,20 @@ function peg$parse(input, options) {
     throw peg$buildSimpleError(message, location);
   }
 
+  function peg$getUnicode(pos = peg$currPos) {
+    const cp = input.codePointAt(pos);
+    if (cp === undefined) {
+      return "";
+    }
+    return String.fromCodePoint(cp);
+  }
+
   function peg$literalExpectation(text, ignoreCase) {
-    return { type: "literal", text: text, ignoreCase: ignoreCase };
+    return { type: "literal", text, ignoreCase };
   }
 
-  function peg$classExpectation(parts, inverted, ignoreCase) {
-    return { type: "class", parts: parts, inverted: inverted, ignoreCase: ignoreCase };
+  function peg$classExpectation(parts, inverted, ignoreCase, unicode) {
+    return { type: "class", parts, inverted, ignoreCase, unicode };
   }
 
   function peg$anyExpectation() {
@@ -669,12 +573,12 @@ function peg$parse(input, options) {
   }
 
   function peg$otherExpectation(description) {
-    return { type: "other", description: description };
+    return { type: "other", description };
   }
 
   function peg$computePosDetails(pos) {
-    var details = peg$posDetailsCache[pos];
-    var p;
+    let details = peg$posDetailsCache[pos];
+    let p;
 
     if (details) {
       return details;
@@ -689,7 +593,7 @@ function peg$parse(input, options) {
       details = peg$posDetailsCache[p];
       details = {
         line: details.line,
-        column: details.column
+        column: details.column,
       };
 
       while (p < pos) {
@@ -710,21 +614,21 @@ function peg$parse(input, options) {
   }
 
   function peg$computeLocation(startPos, endPos, offset) {
-    var startPosDetails = peg$computePosDetails(startPos);
-    var endPosDetails = peg$computePosDetails(endPos);
+    const startPosDetails = peg$computePosDetails(startPos);
+    const endPosDetails = peg$computePosDetails(endPos);
 
-    var res = {
+    const res = {
       source: peg$source,
       start: {
         offset: startPos,
         line: startPosDetails.line,
-        column: startPosDetails.column
+        column: startPosDetails.column,
       },
       end: {
         offset: endPos,
         line: endPosDetails.line,
-        column: endPosDetails.column
-      }
+        column: endPosDetails.column,
+      },
     };
     if (offset && peg$source && (typeof peg$source.offset === "function")) {
       res.start = peg$source.offset(res.start);
@@ -758,7 +662,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsequery() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -771,7 +675,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterList() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = [];
@@ -796,7 +700,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilter() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parsedefaultFilter();
@@ -814,7 +718,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedefaultFilter() {
-    var s0, s1, s2, s3, s4, s5, s6, s7;
+    let s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -853,12 +757,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportFieldDynamic() {
-    var s0, s1, s2, s3, s4, s5, s6, s7;
+    let s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
     if (s1.toLowerCase() === peg$c1) {
-      peg$currPos += 12;
+      peg$currPos += (12);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e1); }
@@ -866,7 +770,7 @@ function peg$parse(input, options) {
     if (s1 === peg$FAILED) {
       s1 = input.substr(peg$currPos, 11);
       if (s1.toLowerCase() === peg$c2) {
-        peg$currPos += 11;
+        peg$currPos += (11);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e2); }
@@ -974,7 +878,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefreeTextFilter() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -1001,7 +905,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseautocompleteKey() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -1160,7 +1064,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterKey() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parseautocompleteKey();
@@ -1174,7 +1078,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseidentifier() {
-    var s0, s1, s2, s3, s4;
+    let s0, s1, s2, s3, s4;
 
     s0 = peg$currPos;
     s1 = peg$currPos;
@@ -1236,12 +1140,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedate() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c4) {
-      peg$currPos += 4;
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e7); }
@@ -1256,12 +1160,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseamount() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c5) {
-      peg$currPos += 6;
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e8); }
@@ -1276,12 +1180,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsemerchant() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c6) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e9); }
@@ -1296,12 +1200,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedescription() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c7) {
-      peg$currPos += 11;
+      peg$currPos += (11);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e10); }
@@ -1316,11 +1220,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportID() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 8);
     if (s0.toLowerCase() === peg$c8) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e11); }
@@ -1329,7 +1233,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 9);
       if (s1.toLowerCase() === peg$c9) {
-        peg$currPos += 9;
+        peg$currPos += (9);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e12); }
@@ -1344,13 +1248,13 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsekeyword() {
-    var s0, s1;
+  function peg$parsein() {
+    let s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 7);
+    s1 = input.substr(peg$currPos, 2);
     if (s1.toLowerCase() === peg$c10) {
-      peg$currPos += 7;
+      peg$currPos += (2);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e13); }
@@ -1364,13 +1268,13 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsein() {
-    var s0, s1;
+  function peg$parsecurrency() {
+    let s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 2);
+    s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c11) {
-      peg$currPos += 2;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e14); }
@@ -1384,48 +1288,28 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsecurrency() {
-    var s0, s1;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c12) {
-      peg$currPos += 8;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e15); }
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f14();
-    }
-    s0 = s1;
-
-    return s0;
-  }
-
   function peg$parsegroupCurrency() {
-    var s0, s1;
+    let s0, s1;
 
-    if (input.substr(peg$currPos, 13) === peg$c13) {
-      s0 = peg$c13;
+    if (input.substr(peg$currPos, 13) === peg$c12) {
+      s0 = peg$c12;
       peg$currPos += 13;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e16); }
+      if (peg$silentFails === 0) { peg$fail(peg$e15); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 14);
-      if (s1.toLowerCase() === peg$c14) {
-        peg$currPos += 14;
+      if (s1.toLowerCase() === peg$c13) {
+        peg$currPos += (14);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e17); }
+        if (peg$silentFails === 0) { peg$fail(peg$e16); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f15();
+        s1 = peg$f14();
       }
       s0 = s1;
     }
@@ -1434,19 +1318,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetag() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c15) {
-      peg$currPos += 3;
+    if (s1.toLowerCase() === peg$c14) {
+      peg$currPos += (3);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e18); }
+      if (peg$silentFails === 0) { peg$fail(peg$e17); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f16();
+      s1 = peg$f15();
     }
     s0 = s1;
 
@@ -1454,19 +1338,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecategory() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c16) {
-      peg$currPos += 8;
+    if (s1.toLowerCase() === peg$c15) {
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e19); }
+      if (peg$silentFails === 0) { peg$fail(peg$e18); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f17();
+      s1 = peg$f16();
     }
     s0 = s1;
 
@@ -1474,19 +1358,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseto() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
-    if (s1.toLowerCase() === peg$c17) {
-      peg$currPos += 2;
+    if (s1.toLowerCase() === peg$c16) {
+      peg$currPos += (2);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e20); }
+      if (peg$silentFails === 0) { peg$fail(peg$e19); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f18();
+      s1 = peg$f17();
     }
     s0 = s1;
 
@@ -1494,19 +1378,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexporter() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c18) {
-      peg$currPos += 8;
+    if (s1.toLowerCase() === peg$c17) {
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e21); }
+      if (peg$silentFails === 0) { peg$fail(peg$e20); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f19();
+      s1 = peg$f18();
     }
     s0 = s1;
 
@@ -1514,19 +1398,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepayer() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c19) {
-      peg$currPos += 5;
+    if (s1.toLowerCase() === peg$c18) {
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e22); }
+      if (peg$silentFails === 0) { peg$fail(peg$e21); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f20();
+      s1 = peg$f19();
     }
     s0 = s1;
 
@@ -1534,27 +1418,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetaxRate() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
-    if (s0.toLowerCase() === peg$c20) {
-      peg$currPos += 7;
+    if (s0.toLowerCase() === peg$c19) {
+      peg$currPos += (7);
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e23); }
+      if (peg$silentFails === 0) { peg$fail(peg$e22); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
-      if (s1.toLowerCase() === peg$c21) {
-        peg$currPos += 8;
+      if (s1.toLowerCase() === peg$c20) {
+        peg$currPos += (8);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e24); }
+        if (peg$silentFails === 0) { peg$fail(peg$e23); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f21();
+        s1 = peg$f20();
       }
       s0 = s1;
     }
@@ -1563,27 +1447,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecardID() {
-    var s0, s1;
+    let s0, s1;
 
-    if (input.substr(peg$currPos, 6) === peg$c22) {
-      s0 = peg$c22;
+    if (input.substr(peg$currPos, 6) === peg$c21) {
+      s0 = peg$c21;
       peg$currPos += 6;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e25); }
+      if (peg$silentFails === 0) { peg$fail(peg$e24); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 4);
-      if (s1.toLowerCase() === peg$c23) {
-        peg$currPos += 4;
+      if (s1.toLowerCase() === peg$c22) {
+        peg$currPos += (4);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e26); }
+        if (peg$silentFails === 0) { peg$fail(peg$e25); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f22();
+        s1 = peg$f21();
       }
       s0 = s1;
     }
@@ -1592,19 +1476,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefrom() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c24) {
-      peg$currPos += 4;
+    if (s1.toLowerCase() === peg$c23) {
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e27); }
+      if (peg$silentFails === 0) { peg$fail(peg$e26); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f23();
+      s1 = peg$f22();
     }
     s0 = s1;
 
@@ -1612,19 +1496,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseattendee() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c25) {
-      peg$currPos += 8;
+    if (s1.toLowerCase() === peg$c24) {
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e28); }
+      if (peg$silentFails === 0) { peg$fail(peg$e27); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f24();
+      s1 = peg$f23();
     }
     s0 = s1;
 
@@ -1632,27 +1516,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexpenseType() {
-    var s0, s1;
+    let s0, s1;
 
-    if (input.substr(peg$currPos, 11) === peg$c26) {
-      s0 = peg$c26;
+    if (input.substr(peg$currPos, 11) === peg$c25) {
+      s0 = peg$c25;
       peg$currPos += 11;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e29); }
+      if (peg$silentFails === 0) { peg$fail(peg$e28); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 12);
-      if (s1.toLowerCase() === peg$c27) {
-        peg$currPos += 12;
+      if (s1.toLowerCase() === peg$c26) {
+        peg$currPos += (12);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e30); }
+        if (peg$silentFails === 0) { peg$fail(peg$e29); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f25();
+        s1 = peg$f24();
       }
       s0 = s1;
     }
@@ -1661,27 +1545,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalType() {
-    var s0, s1;
+    let s0, s1;
 
-    if (input.substr(peg$currPos, 14) === peg$c28) {
-      s0 = peg$c28;
+    if (input.substr(peg$currPos, 14) === peg$c27) {
+      s0 = peg$c27;
       peg$currPos += 14;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e31); }
+      if (peg$silentFails === 0) { peg$fail(peg$e30); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 15);
-      if (s1.toLowerCase() === peg$c29) {
-        peg$currPos += 15;
+      if (s1.toLowerCase() === peg$c28) {
+        peg$currPos += (15);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e32); }
+        if (peg$silentFails === 0) { peg$fail(peg$e31); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f26();
+        s1 = peg$f25();
       }
       s0 = s1;
     }
@@ -1690,27 +1574,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalID() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 12);
-    if (s0.toLowerCase() === peg$c30) {
-      peg$currPos += 12;
+    if (s0.toLowerCase() === peg$c29) {
+      peg$currPos += (12);
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e33); }
+      if (peg$silentFails === 0) { peg$fail(peg$e32); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 13);
-      if (s1.toLowerCase() === peg$c31) {
-        peg$currPos += 13;
+      if (s1.toLowerCase() === peg$c30) {
+        peg$currPos += (13);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e34); }
+        if (peg$silentFails === 0) { peg$fail(peg$e33); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f27();
+        s1 = peg$f26();
       }
       s0 = s1;
     }
@@ -1719,19 +1603,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsebillable() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c32) {
-      peg$currPos += 8;
+    if (s1.toLowerCase() === peg$c31) {
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e35); }
+      if (peg$silentFails === 0) { peg$fail(peg$e34); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f28();
+      s1 = peg$f27();
     }
     s0 = s1;
 
@@ -1739,19 +1623,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereimbursable() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
-    if (s1.toLowerCase() === peg$c33) {
-      peg$currPos += 12;
+    if (s1.toLowerCase() === peg$c32) {
+      peg$currPos += (12);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e36); }
+      if (peg$silentFails === 0) { peg$fail(peg$e35); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f29();
+      s1 = peg$f28();
     }
     s0 = s1;
 
@@ -1759,19 +1643,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetype() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c34) {
-      peg$currPos += 4;
+    if (s1.toLowerCase() === peg$c33) {
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e37); }
+      if (peg$silentFails === 0) { peg$fail(peg$e36); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f30();
+      s1 = peg$f29();
     }
     s0 = s1;
 
@@ -1779,105 +1663,47 @@ function peg$parse(input, options) {
   }
 
   function peg$parsestatus() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c35) {
-      peg$currPos += 6;
+    if (s1.toLowerCase() === peg$c34) {
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e38); }
+      if (peg$silentFails === 0) { peg$fail(peg$e37); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f31();
+      s1 = peg$f30();
     }
     s0 = s1;
 
     return s0;
   }
 
-  function peg$parsesortBy() {
-    var s0, s1;
-
-    if (input.substr(peg$currPos, 6) === peg$c36) {
-      s0 = peg$c36;
-      peg$currPos += 6;
-    } else {
-      s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e39); }
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = input.substr(peg$currPos, 7);
-      if (s1.toLowerCase() === peg$c37) {
-        peg$currPos += 7;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e40); }
-      }
-      if (s1 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$f32();
-      }
-      s0 = s1;
-    }
-
-    return s0;
-  }
-
-  function peg$parsesortOrder() {
-    var s0, s1;
-
-    if (input.substr(peg$currPos, 9) === peg$c38) {
-      s0 = peg$c38;
-      peg$currPos += 9;
-    } else {
-      s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e41); }
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = input.substr(peg$currPos, 10);
-      if (s1.toLowerCase() === peg$c39) {
-        peg$currPos += 10;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e42); }
-      }
-      if (s1 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$f33();
-      }
-      s0 = s1;
-    }
-
-    return s0;
-  }
-
   function peg$parsepolicyID() {
-    var s0, s1;
+    let s0, s1;
 
-    if (input.substr(peg$currPos, 8) === peg$c40) {
-      s0 = peg$c40;
+    if (input.substr(peg$currPos, 8) === peg$c35) {
+      s0 = peg$c35;
       peg$currPos += 8;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e43); }
+      if (peg$silentFails === 0) { peg$fail(peg$e38); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 9);
-      if (s1.toLowerCase() === peg$c41) {
-        peg$currPos += 9;
+      if (s1.toLowerCase() === peg$c36) {
+        peg$currPos += (9);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e44); }
+        if (peg$silentFails === 0) { peg$fail(peg$e39); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f34();
+        s1 = peg$f31();
       }
       s0 = s1;
     }
@@ -1886,19 +1712,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesubmitted() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c42) {
-      peg$currPos += 9;
+    if (s1.toLowerCase() === peg$c37) {
+      peg$currPos += (9);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e45); }
+      if (peg$silentFails === 0) { peg$fail(peg$e40); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f35();
+      s1 = peg$f32();
     }
     s0 = s1;
 
@@ -1906,19 +1732,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseapproved() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c43) {
-      peg$currPos += 8;
+    if (s1.toLowerCase() === peg$c38) {
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e46); }
+      if (peg$silentFails === 0) { peg$fail(peg$e41); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f36();
+      s1 = peg$f33();
     }
     s0 = s1;
 
@@ -1926,19 +1752,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepaid() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c44) {
-      peg$currPos += 4;
+    if (s1.toLowerCase() === peg$c39) {
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e47); }
+      if (peg$silentFails === 0) { peg$fail(peg$e42); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f37();
+      s1 = peg$f34();
     }
     s0 = s1;
 
@@ -1946,19 +1772,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexported() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c45) {
-      peg$currPos += 8;
+    if (s1.toLowerCase() === peg$c40) {
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e48); }
+      if (peg$silentFails === 0) { peg$fail(peg$e43); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f38();
+      s1 = peg$f35();
     }
     s0 = s1;
 
@@ -1966,19 +1792,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseposted() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c46) {
-      peg$currPos += 6;
+    if (s1.toLowerCase() === peg$c41) {
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e49); }
+      if (peg$silentFails === 0) { peg$fail(peg$e44); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f39();
+      s1 = peg$f36();
     }
     s0 = s1;
 
@@ -1986,19 +1812,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawn() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c47) {
-      peg$currPos += 9;
+    if (s1.toLowerCase() === peg$c42) {
+      peg$currPos += (9);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e50); }
+      if (peg$silentFails === 0) { peg$fail(peg$e45); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f40();
+      s1 = peg$f37();
     }
     s0 = s1;
 
@@ -2006,27 +1832,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupBy() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
-    if (s0.toLowerCase() === peg$c48) {
-      peg$currPos += 7;
+    if (s0.toLowerCase() === peg$c43) {
+      peg$currPos += (7);
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e51); }
+      if (peg$silentFails === 0) { peg$fail(peg$e46); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
-      if (s1.toLowerCase() === peg$c49) {
-        peg$currPos += 8;
+      if (s1.toLowerCase() === peg$c44) {
+        peg$currPos += (8);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e52); }
+        if (peg$silentFails === 0) { peg$fail(peg$e47); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f41();
+        s1 = peg$f38();
       }
       s0 = s1;
     }
@@ -2035,19 +1861,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parselimit() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c50) {
-      peg$currPos += 5;
+    if (s1.toLowerCase() === peg$c45) {
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e53); }
+      if (peg$silentFails === 0) { peg$fail(peg$e48); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f42();
+      s1 = peg$f39();
     }
     s0 = s1;
 
@@ -2055,19 +1881,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefeed() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c51) {
-      peg$currPos += 4;
+    if (s1.toLowerCase() === peg$c46) {
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e54); }
+      if (peg$silentFails === 0) { peg$fail(peg$e49); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f43();
+      s1 = peg$f40();
     }
     s0 = s1;
 
@@ -2075,19 +1901,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetitle() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c52) {
-      peg$currPos += 5;
+    if (s1.toLowerCase() === peg$c47) {
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e55); }
+      if (peg$silentFails === 0) { peg$fail(peg$e50); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f44();
+      s1 = peg$f41();
     }
     s0 = s1;
 
@@ -2095,19 +1921,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseassignee() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c53) {
-      peg$currPos += 8;
+    if (s1.toLowerCase() === peg$c48) {
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e56); }
+      if (peg$silentFails === 0) { peg$fail(peg$e51); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f45();
+      s1 = peg$f42();
     }
     s0 = s1;
 
@@ -2115,27 +1941,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecreatedBy() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 9);
-    if (s0.toLowerCase() === peg$c54) {
-      peg$currPos += 9;
+    if (s0.toLowerCase() === peg$c49) {
+      peg$currPos += (9);
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e57); }
+      if (peg$silentFails === 0) { peg$fail(peg$e52); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 10);
-      if (s1.toLowerCase() === peg$c55) {
-        peg$currPos += 10;
+      if (s1.toLowerCase() === peg$c50) {
+        peg$currPos += (10);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e58); }
+        if (peg$silentFails === 0) { peg$fail(peg$e53); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f46();
+        s1 = peg$f43();
       }
       s0 = s1;
     }
@@ -2144,19 +1970,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseaction() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c56) {
-      peg$currPos += 6;
+    if (s1.toLowerCase() === peg$c51) {
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e59); }
+      if (peg$silentFails === 0) { peg$fail(peg$e54); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f47();
+      s1 = peg$f44();
     }
     s0 = s1;
 
@@ -2164,1438 +1990,204 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetotal() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c57) {
-      peg$currPos += 5;
+    if (s1.toLowerCase() === peg$c52) {
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e60); }
+      if (peg$silentFails === 0) { peg$fail(peg$e55); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f48();
-    }
-    s0 = s1;
-
-    return s0;
-  }
-
-  function peg$parsehas() {
-    var s0, s1;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c58) {
-      peg$currPos += 3;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e61); }
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f49();
-    }
-    s0 = s1;
-
-    return s0;
-  }
-
-  function peg$parseis() {
-    var s0, s1;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 2);
-    if (s1.toLowerCase() === peg$c59) {
-      peg$currPos += 2;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e62); }
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f50();
-    }
-    s0 = s1;
-
-    return s0;
-  }
-
-  function peg$parsepurchaseAmount() {
-    var s0, s1;
-
-    s0 = input.substr(peg$currPos, 14);
-    if (s0.toLowerCase() === peg$c60) {
-      peg$currPos += 14;
-    } else {
-      s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e63); }
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = input.substr(peg$currPos, 15);
-      if (s1.toLowerCase() === peg$c61) {
-        peg$currPos += 15;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e64); }
-      }
-      if (s1 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$f51();
-      }
-      s0 = s1;
-    }
-
-    return s0;
-  }
-
-  function peg$parsepurchaseCurrency() {
-    var s0, s1;
-
-    s0 = input.substr(peg$currPos, 16);
-    if (s0.toLowerCase() === peg$c62) {
-      peg$currPos += 16;
-    } else {
-      s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e65); }
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = input.substr(peg$currPos, 17);
-      if (s1.toLowerCase() === peg$c63) {
-        peg$currPos += 17;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e66); }
-      }
-      if (s1 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$f52();
-      }
-      s0 = s1;
-    }
-
-    return s0;
-  }
-
-  function peg$parsecolumns() {
-    var s0, s1;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 7);
-    if (s1.toLowerCase() === peg$c64) {
-      peg$currPos += 7;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e67); }
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f53();
-    }
-    s0 = s1;
-
-    return s0;
-  }
-
-  function peg$parseview() {
-    var s0, s1;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c65) {
-      peg$currPos += 4;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e68); }
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f54();
-    }
-    s0 = s1;
-
-    return s0;
-  }
-
-  function peg$parsevalues() {
-    var s0, s1, s2;
-
-    s0 = peg$currPos;
-    peg$savedPos = peg$currPos;
-    s1 = peg$f55();
-    if (s1) {
-      s1 = undefined;
-    } else {
-      s1 = peg$FAILED;
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$parsecolumnsValues();
-      if (s2 !== peg$FAILED) {
-        s1 = [s1, s2];
-        s0 = s1;
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$parseperDiem();
-      if (s0 === peg$FAILED) {
-        s0 = peg$parsedraft();
-      }
-    }
-
-    return s0;
-  }
-
-  function peg$parsecolumnsValues() {
-    var s0;
-
-    s0 = peg$parseoriginalAmount();
-    if (s0 === peg$FAILED) {
-      s0 = peg$parsetaxRateValue();
-      if (s0 === peg$FAILED) {
-        s0 = peg$parsetaxAmount();
-        if (s0 === peg$FAILED) {
-          s0 = peg$parsepolicyName();
-          if (s0 === peg$FAILED) {
-            s0 = peg$parsewithdrawalId();
-            if (s0 === peg$FAILED) {
-              s0 = peg$parsebankAccount();
-              if (s0 === peg$FAILED) {
-                s0 = peg$parsereportId();
-                if (s0 === peg$FAILED) {
-                  s0 = peg$parsebase62ReportId();
-                  if (s0 === peg$FAILED) {
-                    s0 = peg$parseexportedToColumnValue();
-                    if (s0 === peg$FAILED) {
-                      s0 = peg$parseexchangeRate();
-                      if (s0 === peg$FAILED) {
-                        s0 = peg$parsereimbursableTotal();
-                        if (s0 === peg$FAILED) {
-                          s0 = peg$parsenonReimbursableTotal();
-                          if (s0 === peg$FAILED) {
-                            s0 = peg$parsegroupFrom();
-                            if (s0 === peg$FAILED) {
-                              s0 = peg$parsegroupExpenses();
-                              if (s0 === peg$FAILED) {
-                                s0 = peg$parsegroupTotal();
-                                if (s0 === peg$FAILED) {
-                                  s0 = peg$parsegroupCard();
-                                  if (s0 === peg$FAILED) {
-                                    s0 = peg$parsegroupFeed();
-                                    if (s0 === peg$FAILED) {
-                                      s0 = peg$parsegroupBankAccount();
-                                      if (s0 === peg$FAILED) {
-                                        s0 = peg$parsegroupWithdrawn();
-                                        if (s0 === peg$FAILED) {
-                                          s0 = peg$parsegroupWithdrawalId();
-                                          if (s0 === peg$FAILED) {
-                                            s0 = peg$parsegroupCategory();
-                                            if (s0 === peg$FAILED) {
-                                              s0 = peg$parsegroupTag();
-                                              if (s0 === peg$FAILED) {
-                                                s0 = peg$parsegroupMerchant();
-                                                if (s0 === peg$FAILED) {
-                                                  s0 = peg$parsegroupMonth();
-                                                  if (s0 === peg$FAILED) {
-                                                    s0 = peg$parsegroupWeek();
-                                                    if (s0 === peg$FAILED) {
-                                                      s0 = peg$parsegroupYear();
-                                                      if (s0 === peg$FAILED) {
-                                                        s0 = peg$parsegroupQuarter();
-                                                      }
-                                                    }
-                                                  }
-                                                }
-                                              }
-                                            }
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-
-    return s0;
-  }
-
-  function peg$parseperDiem() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c66) {
-      peg$currPos += 8;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e69); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f56();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsedraft() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c67) {
-      peg$currPos += 6;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e70); }
-    }
-    if (s1 === peg$FAILED) {
-      s1 = input.substr(peg$currPos, 5);
-      if (s1.toLowerCase() === peg$c68) {
-        peg$currPos += 5;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e71); }
-      }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f57();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parseoriginalAmount() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 15);
-    if (s1.toLowerCase() === peg$c69) {
-      peg$currPos += 15;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e72); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f58();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsetaxAmount() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c70) {
-      peg$currPos += 3;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e73); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f59();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsetaxRateValue() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c21) {
-      peg$currPos += 8;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e24); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f60();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsepolicyName() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c71) {
-      peg$currPos += 11;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e74); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f61();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsewithdrawalId() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 13);
-    if (s1.toLowerCase() === peg$c31) {
-      peg$currPos += 13;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e34); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f62();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsebankAccount() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 12);
-    if (s1.toLowerCase() === peg$c72) {
-      peg$currPos += 12;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e75); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f63();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsereportId() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c73) {
-      peg$currPos += 14;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e76); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f64();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsebase62ReportId() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c9) {
-      peg$currPos += 9;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e12); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f65();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parseexportedToColumnValue() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c74) {
-      peg$currPos += 11;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e77); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f66();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parseexportedToKeyEnd() {
-    var s0, s1, s2;
-
-    s0 = peg$parsewordBoundary();
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = peg$parse_();
-      s2 = input.charAt(peg$currPos);
-      if (peg$r1.test(s2)) {
-        peg$currPos++;
-      } else {
-        s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e78); }
-      }
-      if (s2 !== peg$FAILED) {
-        s1 = [s1, s2];
-        s0 = s1;
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    }
-
-    return s0;
-  }
-
-  function peg$parseexportedTo() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c75) {
-      peg$currPos += 10;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e79); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parseexportedToKeyEnd();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f67();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = input.substr(peg$currPos, 11);
-      if (s1.toLowerCase() === peg$c74) {
-        peg$currPos += 11;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e77); }
-      }
-      if (s1 !== peg$FAILED) {
-        s2 = peg$currPos;
-        peg$silentFails++;
-        s3 = peg$parseexportedToKeyEnd();
-        peg$silentFails--;
-        if (s3 !== peg$FAILED) {
-          peg$currPos = s2;
-          s2 = undefined;
-        } else {
-          s2 = peg$FAILED;
-        }
-        if (s2 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s0 = peg$f68();
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    }
-
-    return s0;
-  }
-
-  function peg$parseexchangeRate() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 13);
-    if (s1.toLowerCase() === peg$c76) {
-      peg$currPos += 13;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e80); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f69();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsereimbursableTotal() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 18);
-    if (s1.toLowerCase() === peg$c77) {
-      peg$currPos += 18;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e81); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f70();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsenonReimbursableTotal() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 22);
-    if (s1.toLowerCase() === peg$c78) {
-      peg$currPos += 22;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e82); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f71();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupFrom() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c79) {
-      peg$currPos += 10;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e83); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f72();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupExpenses() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c80) {
-      peg$currPos += 14;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e84); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f73();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupTotal() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c81) {
-      peg$currPos += 11;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e85); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f74();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupCard() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c82) {
-      peg$currPos += 10;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e86); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f75();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupFeed() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c83) {
-      peg$currPos += 10;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e87); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f76();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupBankAccount() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 18);
-    if (s1.toLowerCase() === peg$c84) {
-      peg$currPos += 18;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e88); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f77();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupWithdrawn() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 15);
-    if (s1.toLowerCase() === peg$c85) {
-      peg$currPos += 15;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e89); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f78();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupWithdrawalId() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 19);
-    if (s1.toLowerCase() === peg$c86) {
-      peg$currPos += 19;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e90); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f79();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
+      s1 = peg$f45();
     }
+    s0 = s1;
 
     return s0;
   }
 
-  function peg$parsegroupCategory() {
-    var s0, s1, s2, s3;
+  function peg$parsehas() {
+    let s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c87) {
-      peg$currPos += 14;
+    s1 = input.substr(peg$currPos, 3);
+    if (s1.toLowerCase() === peg$c53) {
+      peg$currPos += (3);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e91); }
+      if (peg$silentFails === 0) { peg$fail(peg$e56); }
     }
     if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f80();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
+      peg$savedPos = s0;
+      s1 = peg$f46();
     }
+    s0 = s1;
 
     return s0;
   }
 
-  function peg$parsegroupTag() {
-    var s0, s1, s2, s3;
+  function peg$parseis() {
+    let s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c88) {
-      peg$currPos += 9;
+    s1 = input.substr(peg$currPos, 2);
+    if (s1.toLowerCase() === peg$c54) {
+      peg$currPos += (2);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e92); }
+      if (peg$silentFails === 0) { peg$fail(peg$e57); }
     }
     if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f81();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
+      peg$savedPos = s0;
+      s1 = peg$f47();
     }
+    s0 = s1;
 
     return s0;
   }
 
-  function peg$parsegroupMerchant() {
-    var s0, s1, s2, s3;
+  function peg$parsepurchaseAmount() {
+    let s0, s1;
 
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c89) {
-      peg$currPos += 14;
+    s0 = input.substr(peg$currPos, 14);
+    if (s0.toLowerCase() === peg$c55) {
+      peg$currPos += (14);
     } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e93); }
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e58); }
     }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 15);
+      if (s1.toLowerCase() === peg$c56) {
+        peg$currPos += (15);
       } else {
-        s2 = peg$FAILED;
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e59); }
       }
-      if (s2 !== peg$FAILED) {
+      if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f82();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
+        s1 = peg$f48();
       }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
+      s0 = s1;
     }
 
     return s0;
   }
 
-  function peg$parsegroupMonth() {
-    var s0, s1, s2, s3;
+  function peg$parsepurchaseCurrency() {
+    let s0, s1;
 
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c90) {
-      peg$currPos += 11;
+    s0 = input.substr(peg$currPos, 16);
+    if (s0.toLowerCase() === peg$c57) {
+      peg$currPos += (16);
     } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e94); }
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e60); }
     }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 17);
+      if (s1.toLowerCase() === peg$c58) {
+        peg$currPos += (17);
       } else {
-        s2 = peg$FAILED;
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e61); }
       }
-      if (s2 !== peg$FAILED) {
+      if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f83();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
+        s1 = peg$f49();
       }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
+      s0 = s1;
     }
 
     return s0;
   }
 
-  function peg$parsegroupWeek() {
-    var s0, s1, s2, s3;
+  function peg$parsecolumns() {
+    let s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c91) {
-      peg$currPos += 10;
+    s1 = input.substr(peg$currPos, 7);
+    if (s1.toLowerCase() === peg$c59) {
+      peg$currPos += (7);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e95); }
+      if (peg$silentFails === 0) { peg$fail(peg$e62); }
     }
     if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f84();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
+      peg$savedPos = s0;
+      s1 = peg$f50();
     }
+    s0 = s1;
 
     return s0;
   }
 
-  function peg$parsegroupYear() {
-    var s0, s1, s2, s3;
+  function peg$parseview() {
+    let s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c92) {
-      peg$currPos += 10;
+    s1 = input.substr(peg$currPos, 4);
+    if (s1.toLowerCase() === peg$c60) {
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e96); }
+      if (peg$silentFails === 0) { peg$fail(peg$e63); }
     }
     if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
+      peg$savedPos = s0;
+      s1 = peg$f51();
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
+  function peg$parseexportedToKeyEnd() {
+    let s0, s1, s2;
+
+    s0 = peg$parsewordBoundary();
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = peg$parse_();
+      s2 = input.charAt(peg$currPos);
+      if (peg$r1.test(s2)) {
+        peg$currPos++;
       } else {
         s2 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e64); }
       }
       if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f85();
+        s1 = [s1, s2];
+        s0 = s1;
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
       }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
     }
 
     return s0;
   }
 
-  function peg$parsegroupQuarter() {
-    var s0, s1, s2, s3;
+  function peg$parseexportedTo() {
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 13);
-    if (s1.toLowerCase() === peg$c93) {
-      peg$currPos += 13;
+    s1 = input.substr(peg$currPos, 10);
+    if (s1.toLowerCase() === peg$c61) {
+      peg$currPos += (10);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e97); }
+      if (peg$silentFails === 0) { peg$fail(peg$e65); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
       peg$silentFails++;
-      s3 = peg$parsewordBoundary();
+      s3 = peg$parseexportedToKeyEnd();
       peg$silentFails--;
       if (s3 !== peg$FAILED) {
         peg$currPos = s2;
@@ -3605,7 +2197,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f86();
+        s0 = peg$f52();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3614,97 +2206,144 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 11);
+      if (s1.toLowerCase() === peg$c62) {
+        peg$currPos += (11);
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e66); }
+      }
+      if (s1 !== peg$FAILED) {
+        s2 = peg$currPos;
+        peg$silentFails++;
+        s3 = peg$parseexportedToKeyEnd();
+        peg$silentFails--;
+        if (s3 !== peg$FAILED) {
+          peg$currPos = s2;
+          s2 = undefined;
+        } else {
+          s2 = peg$FAILED;
+        }
+        if (s2 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s0 = peg$f53();
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    }
 
     return s0;
   }
 
   function peg$parseoperator() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
-    s1 = input.charAt(peg$currPos);
-    if (peg$r1.test(s1)) {
-      peg$currPos++;
+    if (input.substr(peg$currPos, 2) === peg$c63) {
+      s1 = peg$c63;
+      peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e78); }
+      if (peg$silentFails === 0) { peg$fail(peg$e68); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f87();
+      s1 = peg$f54();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c94) {
-        s1 = peg$c94;
-        peg$currPos += 2;
+      s1 = input.charAt(peg$currPos);
+      if (peg$r1.test(s1)) {
+        peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e99); }
+        if (peg$silentFails === 0) { peg$fail(peg$e64); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f88();
+        s1 = peg$f55();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 2) === peg$c95) {
-          s1 = peg$c95;
+        if (input.substr(peg$currPos, 2) === peg$c64) {
+          s1 = peg$c64;
           peg$currPos += 2;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e100); }
+          if (peg$silentFails === 0) { peg$fail(peg$e69); }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f89();
+          s1 = peg$f56();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
-          if (input.charCodeAt(peg$currPos) === 62) {
-            s1 = peg$c96;
-            peg$currPos++;
+          if (input.substr(peg$currPos, 2) === peg$c65) {
+            s1 = peg$c65;
+            peg$currPos += 2;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e101); }
+            if (peg$silentFails === 0) { peg$fail(peg$e70); }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$f90();
+            s1 = peg$f57();
           }
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 2) === peg$c97) {
-              s1 = peg$c97;
-              peg$currPos += 2;
+            if (input.charCodeAt(peg$currPos) === 62) {
+              s1 = peg$c66;
+              peg$currPos++;
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e102); }
+              if (peg$silentFails === 0) { peg$fail(peg$e71); }
             }
             if (s1 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$f91();
+              s1 = peg$f58();
             }
             s0 = s1;
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
-              if (input.charCodeAt(peg$currPos) === 60) {
-                s1 = peg$c98;
-                peg$currPos++;
+              if (input.substr(peg$currPos, 2) === peg$c67) {
+                s1 = peg$c67;
+                peg$currPos += 2;
               } else {
                 s1 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e103); }
+                if (peg$silentFails === 0) { peg$fail(peg$e72); }
               }
               if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$f92();
+                s1 = peg$f59();
               }
               s0 = s1;
+              if (s0 === peg$FAILED) {
+                s0 = peg$currPos;
+                if (input.charCodeAt(peg$currPos) === 60) {
+                  s1 = peg$c68;
+                  peg$currPos++;
+                } else {
+                  s1 = peg$FAILED;
+                  if (peg$silentFails === 0) { peg$fail(peg$e73); }
+                }
+                if (s1 !== peg$FAILED) {
+                  peg$savedPos = s0;
+                  s1 = peg$f60();
+                }
+                s0 = s1;
+              }
             }
           }
         }
@@ -3713,20 +2352,20 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e98); }
+      if (peg$silentFails === 0) { peg$fail(peg$e67); }
     }
 
     return s0;
   }
 
   function peg$parsefilterOperator() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parseoperator();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f93(s1);
+      s1 = peg$f61(s1);
     }
     s0 = s1;
 
@@ -3734,7 +2373,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsealphanumeric() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -3744,7 +2383,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e105); }
+      if (peg$silentFails === 0) { peg$fail(peg$e75); }
     }
     if (s2 !== peg$FAILED) {
       while (s2 !== peg$FAILED) {
@@ -3754,7 +2393,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e105); }
+          if (peg$silentFails === 0) { peg$fail(peg$e75); }
         }
       }
     } else {
@@ -3762,32 +2401,32 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f94(s1);
+      s1 = peg$f62(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e104); }
+      if (peg$silentFails === 0) { peg$fail(peg$e74); }
     }
 
     return s0;
   }
 
   function peg$parselogicalAnd() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
     peg$savedPos = s0;
-    s1 = peg$f95();
+    s1 = peg$f63();
     s0 = s1;
 
     return s0;
   }
 
   function peg$parse_() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = [];
@@ -3796,7 +2435,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e107); }
+      if (peg$silentFails === 0) { peg$fail(peg$e76); }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
@@ -3805,22 +2444,20 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e107); }
+        if (peg$silentFails === 0) { peg$fail(peg$e76); }
       }
     }
     peg$silentFails--;
-    s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e106); }
 
     return s0;
   }
 
   function peg$parsequotedString() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
-    s1 = peg$f96();
+    s1 = peg$f64();
     if (s1) {
       s1 = undefined;
     } else {
@@ -3847,7 +2484,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesimpleQuotedString() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -3857,7 +2494,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e109); }
+      if (peg$silentFails === 0) { peg$fail(peg$e78); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -3866,7 +2503,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e109); }
+        if (peg$silentFails === 0) { peg$fail(peg$e78); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -3874,7 +2511,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e110); }
+      if (peg$silentFails === 0) { peg$fail(peg$e79); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -3883,7 +2520,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e111); }
+        if (peg$silentFails === 0) { peg$fail(peg$e80); }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
@@ -3892,7 +2529,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e111); }
+          if (peg$silentFails === 0) { peg$fail(peg$e80); }
         }
       }
       s4 = input.charAt(peg$currPos);
@@ -3900,7 +2537,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e110); }
+        if (peg$silentFails === 0) { peg$fail(peg$e79); }
       }
       if (s4 !== peg$FAILED) {
         s5 = [];
@@ -3909,7 +2546,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e105); }
+          if (peg$silentFails === 0) { peg$fail(peg$e75); }
         }
         while (s6 !== peg$FAILED) {
           s5.push(s6);
@@ -3918,11 +2555,11 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e105); }
+            if (peg$silentFails === 0) { peg$fail(peg$e75); }
           }
         }
         peg$savedPos = s0;
-        s0 = peg$f97(s1, s3, s5);
+        s0 = peg$f65(s1, s3, s5);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3934,14 +2571,14 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e108); }
+      if (peg$silentFails === 0) { peg$fail(peg$e77); }
     }
 
     return s0;
   }
 
   function peg$parsenestedQuotedString() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -3951,7 +2588,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e109); }
+      if (peg$silentFails === 0) { peg$fail(peg$e78); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -3960,7 +2597,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e109); }
+        if (peg$silentFails === 0) { peg$fail(peg$e78); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -3968,7 +2605,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e110); }
+      if (peg$silentFails === 0) { peg$fail(peg$e79); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -3977,7 +2614,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e111); }
+        if (peg$silentFails === 0) { peg$fail(peg$e80); }
       }
       if (s4 === peg$FAILED) {
         s4 = peg$currPos;
@@ -3993,15 +2630,15 @@ function peg$parse(input, options) {
         }
         if (s5 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 8220) {
-            s6 = peg$c99;
+            s6 = peg$c69;
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e112); }
+            if (peg$silentFails === 0) { peg$fail(peg$e81); }
           }
           if (s6 !== peg$FAILED) {
             peg$savedPos = s4;
-            s4 = peg$f98(s1);
+            s4 = peg$f66(s1);
           } else {
             peg$currPos = s4;
             s4 = peg$FAILED;
@@ -4024,15 +2661,15 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8221) {
-              s6 = peg$c100;
+              s6 = peg$c70;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e113); }
+              if (peg$silentFails === 0) { peg$fail(peg$e82); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f99(s1);
+              s4 = peg$f67(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -4055,15 +2692,15 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 34) {
-                s6 = peg$c101;
+                s6 = peg$c71;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e114); }
+                if (peg$silentFails === 0) { peg$fail(peg$e83); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f100(s1);
+                s4 = peg$f68(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -4082,7 +2719,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e111); }
+          if (peg$silentFails === 0) { peg$fail(peg$e80); }
         }
         if (s4 === peg$FAILED) {
           s4 = peg$currPos;
@@ -4098,15 +2735,15 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8220) {
-              s6 = peg$c99;
+              s6 = peg$c69;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e112); }
+              if (peg$silentFails === 0) { peg$fail(peg$e81); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f98(s1);
+              s4 = peg$f66(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -4129,15 +2766,15 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 8221) {
-                s6 = peg$c100;
+                s6 = peg$c70;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e113); }
+                if (peg$silentFails === 0) { peg$fail(peg$e82); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f99(s1);
+                s4 = peg$f67(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -4160,15 +2797,15 @@ function peg$parse(input, options) {
               }
               if (s5 !== peg$FAILED) {
                 if (input.charCodeAt(peg$currPos) === 34) {
-                  s6 = peg$c101;
+                  s6 = peg$c71;
                   peg$currPos++;
                 } else {
                   s6 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e114); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e83); }
                 }
                 if (s6 !== peg$FAILED) {
                   peg$savedPos = s4;
-                  s4 = peg$f100(s1);
+                  s4 = peg$f68(s1);
                 } else {
                   peg$currPos = s4;
                   s4 = peg$FAILED;
@@ -4184,7 +2821,7 @@ function peg$parse(input, options) {
       s4 = peg$parseclosingQuote();
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f101(s1, s3, s4);
+        s0 = peg$f69(s1, s3, s4);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4196,14 +2833,14 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e108); }
+      if (peg$silentFails === 0) { peg$fail(peg$e77); }
     }
 
     return s0;
   }
 
   function peg$parseclosingQuote() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.charAt(peg$currPos);
@@ -4211,7 +2848,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e110); }
+      if (peg$silentFails === 0) { peg$fail(peg$e79); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4240,7 +2877,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsevalidClosingCondition() {
-    var s0, s1, s2, s3, s4;
+    let s0, s1, s2, s3, s4;
 
     s0 = peg$currPos;
     s1 = [];
@@ -4249,7 +2886,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e115); }
+      if (peg$silentFails === 0) { peg$fail(peg$e84); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -4258,7 +2895,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e115); }
+        if (peg$silentFails === 0) { peg$fail(peg$e84); }
       }
     }
     s2 = [];
@@ -4267,7 +2904,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s3 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e116); }
+      if (peg$silentFails === 0) { peg$fail(peg$e85); }
     }
     while (s3 !== peg$FAILED) {
       s2.push(s3);
@@ -4276,7 +2913,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e116); }
+        if (peg$silentFails === 0) { peg$fail(peg$e85); }
       }
     }
     s3 = [];
@@ -4285,7 +2922,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s4 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e117); }
+      if (peg$silentFails === 0) { peg$fail(peg$e86); }
     }
     while (s4 !== peg$FAILED) {
       s3.push(s4);
@@ -4294,7 +2931,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e117); }
+        if (peg$silentFails === 0) { peg$fail(peg$e86); }
       }
     }
     s4 = peg$parseoperator();
@@ -4313,7 +2950,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e118); }
+        if (peg$silentFails === 0) { peg$fail(peg$e87); }
       }
       while (s2 !== peg$FAILED) {
         s1.push(s2);
@@ -4322,7 +2959,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e118); }
+          if (peg$silentFails === 0) { peg$fail(peg$e87); }
         }
       }
       s2 = peg$currPos;
@@ -4369,7 +3006,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e119); }
+          if (peg$silentFails === 0) { peg$fail(peg$e88); }
         }
       }
     }
@@ -4378,14 +3015,14 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewordBoundary() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.charAt(peg$currPos);
     if (peg$r12.test(s0)) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e120); }
+      if (peg$silentFails === 0) { peg$fail(peg$e89); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
@@ -4424,30 +3061,36 @@ function peg$parse(input, options) {
 
   peg$result = peg$startRuleFunction();
 
-  if (options.peg$library) {
-    return /** @type {any} */ ({
-      peg$result,
-      peg$currPos,
-      peg$FAILED,
-      peg$maxFailExpected,
-      peg$maxFailPos
-    });
-  }
-  if (peg$result !== peg$FAILED && peg$currPos === input.length) {
-    return peg$result;
-  } else {
+  const peg$success = (peg$result !== peg$FAILED && peg$currPos === input.length);
+  function peg$throw() {
     if (peg$result !== peg$FAILED && peg$currPos < input.length) {
       peg$fail(peg$endExpectation());
     }
 
     throw peg$buildStructuredError(
       peg$maxFailExpected,
-      peg$maxFailPos < input.length ? input.charAt(peg$maxFailPos) : null,
+      peg$maxFailPos < input.length ? peg$getUnicode(peg$maxFailPos) : null,
       peg$maxFailPos < input.length
         ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1)
         : peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
     );
   }
+  if (options.peg$library) {
+    return /** @type {any} */ ({
+      peg$result,
+      peg$currPos,
+      peg$FAILED,
+      peg$maxFailExpected,
+      peg$maxFailPos,
+      peg$success,
+      peg$throw: peg$success ? undefined : peg$throw,
+    });
+  }
+  if (peg$success) {
+    return peg$result;
+  } else {
+    peg$throw();
+  }
 }
 
 const peg$allowedStartRules = [
diff --git a/src/libs/SearchParser/baseRules.peggy b/src/libs/SearchParser/baseRules.peggy
index cc6f3e9fbfcb..ad60a1a0959d 100644
--- a/src/libs/SearchParser/baseRules.peggy
+++ b/src/libs/SearchParser/baseRules.peggy
@@ -157,7 +157,8 @@ groupQuarter            = "group-quarter"i &wordBoundary            { return "gr
 
 
 operator "operator"
-  = (":" / "=") { return "eq"; }
+  = "*:" { return "contains"; }
+  / (":" / "=") { return "eq"; }
   / "!=" { return "neq"; }
   / ">=" { return "gte"; }
   / ">" { return "gt"; }
@@ -167,7 +168,7 @@ operator "operator"
 filterOperator
   = o:operator {
       if (nameOperator) {
-        expectingNestedQuote = (o === "eq"); // Use simple parser if no valid operator is found
+        expectingNestedQuote = (o === "eq" || o === "contains");
       }
       isColumnsContext = false;
       return o;
diff --git a/src/libs/SearchParser/searchParser.js b/src/libs/SearchParser/searchParser.js
index de8fe4c0aebe..86fef05c3b2f 100644
--- a/src/libs/SearchParser/searchParser.js
+++ b/src/libs/SearchParser/searchParser.js
@@ -1,4 +1,4 @@
-// @generated by Peggy 4.0.3.
+// @generated by Peggy 5.0.6.
 //
 // https://peggyjs.org/
 
@@ -12,624 +12,615 @@
     return { operator, left, right };
   }
 
-function peg$subclass(child, parent) {
-  function C() { this.constructor = child; }
-  C.prototype = parent.prototype;
-  child.prototype = new C();
-}
-
-function peg$SyntaxError(message, expected, found, location) {
-  var self = Error.call(this, message);
-  // istanbul ignore next Check is a necessary evil to support older environments
-  if (Object.setPrototypeOf) {
-    Object.setPrototypeOf(self, peg$SyntaxError.prototype);
-  }
-  self.expected = expected;
-  self.found = found;
-  self.location = location;
-  self.name = "SyntaxError";
-  return self;
-}
+class peg$SyntaxError extends SyntaxError {
+  constructor(message, expected, found, location) {
+    super(message);
+    this.expected = expected;
+    this.found = found;
+    this.location = location;
+    this.name = "SyntaxError";
+  }
+
+  format(sources) {
+    let str = "Error: " + this.message;
+    if (this.location) {
+      let src = null;
+      const st = sources.find(s => s.source === this.location.source);
+      if (st) {
+        src = st.text.split(/\r\n|\n|\r/g);
+      }
+      const s = this.location.start;
+      const offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
+        ? this.location.source.offset(s)
+        : s;
+      const loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
+      if (src) {
+        const e = this.location.end;
+        const filler = "".padEnd(offset_s.line.toString().length, " ");
+        const line = src[s.line - 1];
+        const last = s.line === e.line ? e.column : line.length + 1;
+        const hatLen = (last - s.column) || 1;
+        str += "\n --> " + loc + "\n"
+            + filler + " |\n"
+            + offset_s.line + " | " + line + "\n"
+            + filler + " | " + "".padEnd(s.column - 1, " ")
+            + "".padEnd(hatLen, "^");
+      } else {
+        str += "\n at " + loc;
+      }
+    }
+    return str;
+  }
 
-peg$subclass(peg$SyntaxError, Error);
+  static buildMessage(expected, found) {
+    function hex(ch) {
+      return ch.codePointAt(0).toString(16).toUpperCase();
+    }
 
-function peg$padEnd(str, targetLength, padString) {
-  padString = padString || " ";
-  if (str.length > targetLength) { return str; }
-  targetLength -= str.length;
-  padString += padString.repeat(targetLength);
-  return str + padString.slice(0, targetLength);
-}
+    const nonPrintable = Object.prototype.hasOwnProperty.call(RegExp.prototype, "unicode")
+      ? new RegExp("[\\p{C}\\p{Mn}\\p{Mc}]", "gu")
+      : null;
+    function unicodeEscape(s) {
+      if (nonPrintable) {
+        return s.replace(nonPrintable,  ch => "\\u{" + hex(ch) + "}");
+      }
+      return s;
+    }
 
-peg$SyntaxError.prototype.format = function(sources) {
-  var str = "Error: " + this.message;
-  if (this.location) {
-    var src = null;
-    var k;
-    for (k = 0; k < sources.length; k++) {
-      if (sources[k].source === this.location.source) {
-        src = sources[k].text.split(/\r\n|\n|\r/g);
-        break;
-      }
-    }
-    var s = this.location.start;
-    var offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
-      ? this.location.source.offset(s)
-      : s;
-    var loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
-    if (src) {
-      var e = this.location.end;
-      var filler = peg$padEnd("", offset_s.line.toString().length, ' ');
-      var line = src[s.line - 1];
-      var last = s.line === e.line ? e.column : line.length + 1;
-      var hatLen = (last - s.column) || 1;
-      str += "\n --> " + loc + "\n"
-          + filler + " |\n"
-          + offset_s.line + " | " + line + "\n"
-          + filler + " | " + peg$padEnd("", s.column - 1, ' ')
-          + peg$padEnd("", hatLen, "^");
-    } else {
-      str += "\n at " + loc;
-    }
-  }
-  return str;
-};
+    function literalEscape(s) {
+      return unicodeEscape(s
+        .replace(/\\/g, "\\\\")
+        .replace(/"/g,  "\\\"")
+        .replace(/\0/g, "\\0")
+        .replace(/\t/g, "\\t")
+        .replace(/\n/g, "\\n")
+        .replace(/\r/g, "\\r")
+        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
+        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
+    }
 
-peg$SyntaxError.buildMessage = function(expected, found) {
-  var DESCRIBE_EXPECTATION_FNS = {
-    literal: function(expectation) {
-      return "\"" + literalEscape(expectation.text) + "\"";
-    },
+    function classEscape(s) {
+      return unicodeEscape(s
+        .replace(/\\/g, "\\\\")
+        .replace(/\]/g, "\\]")
+        .replace(/\^/g, "\\^")
+        .replace(/-/g,  "\\-")
+        .replace(/\0/g, "\\0")
+        .replace(/\t/g, "\\t")
+        .replace(/\n/g, "\\n")
+        .replace(/\r/g, "\\r")
+        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
+        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
+    }
 
-    class: function(expectation) {
-      var escapedParts = expectation.parts.map(function(part) {
-        return Array.isArray(part)
-          ? classEscape(part[0]) + "-" + classEscape(part[1])
-          : classEscape(part);
-      });
+    const DESCRIBE_EXPECTATION_FNS = {
+      literal(expectation) {
+        return "\"" + literalEscape(expectation.text) + "\"";
+      },
 
-      return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]";
-    },
+      class(expectation) {
+        const escapedParts = expectation.parts.map(
+          part => (Array.isArray(part)
+            ? classEscape(part[0]) + "-" + classEscape(part[1])
+            : classEscape(part))
+        );
 
-    any: function() {
-      return "any character";
-    },
+        return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]" + (expectation.unicode ? "u" : "");
+      },
 
-    end: function() {
-      return "end of input";
-    },
+      any() {
+        return "any character";
+      },
 
-    other: function(expectation) {
-      return expectation.description;
-    }
-  };
+      end() {
+        return "end of input";
+      },
 
-  function hex(ch) {
-    return ch.charCodeAt(0).toString(16).toUpperCase();
-  }
+      other(expectation) {
+        return expectation.description;
+      },
+    };
 
-  function literalEscape(s) {
-    return s
-      .replace(/\\/g, "\\\\")
-      .replace(/"/g,  "\\\"")
-      .replace(/\0/g, "\\0")
-      .replace(/\t/g, "\\t")
-      .replace(/\n/g, "\\n")
-      .replace(/\r/g, "\\r")
-      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
-      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
-  }
+    function describeExpectation(expectation) {
+      return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
+    }
 
-  function classEscape(s) {
-    return s
-      .replace(/\\/g, "\\\\")
-      .replace(/\]/g, "\\]")
-      .replace(/\^/g, "\\^")
-      .replace(/-/g,  "\\-")
-      .replace(/\0/g, "\\0")
-      .replace(/\t/g, "\\t")
-      .replace(/\n/g, "\\n")
-      .replace(/\r/g, "\\r")
-      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
-      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
-  }
+    function describeExpected(expected) {
+      const descriptions = expected.map(describeExpectation);
+      descriptions.sort();
 
-  function describeExpectation(expectation) {
-    return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
-  }
+      if (descriptions.length > 0) {
+        let j = 1;
+        for (let i = 1; i < descriptions.length; i++) {
+          if (descriptions[i - 1] !== descriptions[i]) {
+            descriptions[j] = descriptions[i];
+            j++;
+          }
+        }
+        descriptions.length = j;
+      }
 
-  function describeExpected(expected) {
-    var descriptions = expected.map(describeExpectation);
-    var i, j;
+      switch (descriptions.length) {
+        case 1:
+          return descriptions[0];
 
-    descriptions.sort();
+        case 2:
+          return descriptions[0] + " or " + descriptions[1];
 
-    if (descriptions.length > 0) {
-      for (i = 1, j = 1; i < descriptions.length; i++) {
-        if (descriptions[i - 1] !== descriptions[i]) {
-          descriptions[j] = descriptions[i];
-          j++;
-        }
+        default:
+          return descriptions.slice(0, -1).join(", ")
+            + ", or "
+            + descriptions[descriptions.length - 1];
       }
-      descriptions.length = j;
     }
 
-    switch (descriptions.length) {
-      case 1:
-        return descriptions[0];
-
-      case 2:
-        return descriptions[0] + " or " + descriptions[1];
-
-      default:
-        return descriptions.slice(0, -1).join(", ")
-          + ", or "
-          + descriptions[descriptions.length - 1];
+    function describeFound(found) {
+      return found ? "\"" + literalEscape(found) + "\"" : "end of input";
     }
-  }
 
-  function describeFound(found) {
-    return found ? "\"" + literalEscape(found) + "\"" : "end of input";
+    return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
   }
-
-  return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
-};
+}
 
 function peg$parse(input, options) {
   options = options !== undefined ? options : {};
 
-  var peg$FAILED = {};
-  var peg$source = options.grammarSource;
-
-  var peg$startRuleFunctions = { query: peg$parsequery };
-  var peg$startRuleFunction = peg$parsequery;
-
-  var peg$c0 = "-";
-  var peg$c1 = "report-field";
-  var peg$c2 = "reportfield";
-  var peg$c3 = ",";
-  var peg$c4 = "date";
-  var peg$c5 = "amount";
-  var peg$c6 = "merchant";
-  var peg$c7 = "description";
-  var peg$c8 = "reportid";
-  var peg$c9 = "report-id";
-  var peg$c10 = "keyword";
-  var peg$c11 = "in";
-  var peg$c12 = "currency";
-  var peg$c13 = "groupCurrency";
-  var peg$c14 = "group-currency";
-  var peg$c15 = "tag";
-  var peg$c16 = "category";
-  var peg$c17 = "to";
-  var peg$c18 = "exporter";
-  var peg$c19 = "payer";
-  var peg$c20 = "taxrate";
-  var peg$c21 = "tax-rate";
-  var peg$c22 = "cardID";
-  var peg$c23 = "card";
-  var peg$c24 = "from";
-  var peg$c25 = "attendee";
-  var peg$c26 = "expenseType";
-  var peg$c27 = "expense-type";
-  var peg$c28 = "withdrawalType";
-  var peg$c29 = "withdrawal-type";
-  var peg$c30 = "withdrawalid";
-  var peg$c31 = "withdrawal-id";
-  var peg$c32 = "billable";
-  var peg$c33 = "reimbursable";
-  var peg$c34 = "type";
-  var peg$c35 = "status";
-  var peg$c36 = "sortBy";
-  var peg$c37 = "sort-by";
-  var peg$c38 = "sortOrder";
-  var peg$c39 = "sort-order";
-  var peg$c40 = "policyID";
-  var peg$c41 = "workspace";
-  var peg$c42 = "submitted";
-  var peg$c43 = "approved";
-  var peg$c44 = "paid";
-  var peg$c45 = "exported";
-  var peg$c46 = "posted";
-  var peg$c47 = "withdrawn";
-  var peg$c48 = "groupby";
-  var peg$c49 = "group-by";
-  var peg$c50 = "limit";
-  var peg$c51 = "feed";
-  var peg$c52 = "title";
-  var peg$c53 = "assignee";
-  var peg$c54 = "createdby";
-  var peg$c55 = "created-by";
-  var peg$c56 = "action";
-  var peg$c57 = "total";
-  var peg$c58 = "has";
-  var peg$c59 = "is";
-  var peg$c60 = "purchaseamount";
-  var peg$c61 = "purchase-amount";
-  var peg$c62 = "purchasecurrency";
-  var peg$c63 = "purchase-currency";
-  var peg$c64 = "columns";
-  var peg$c65 = "view";
-  var peg$c66 = "per-diem";
-  var peg$c67 = "drafts";
-  var peg$c68 = "draft";
-  var peg$c69 = "original-amount";
-  var peg$c70 = "tax";
-  var peg$c71 = "policy-name";
-  var peg$c72 = "bank-account";
-  var peg$c73 = "long-report-id";
-  var peg$c74 = "exported-to";
-  var peg$c75 = "exportedto";
-  var peg$c76 = "exchange-rate";
-  var peg$c77 = "reimbursable-total";
-  var peg$c78 = "non-reimbursable-total";
-  var peg$c79 = "group-from";
-  var peg$c80 = "group-expenses";
-  var peg$c81 = "group-total";
-  var peg$c82 = "group-card";
-  var peg$c83 = "group-feed";
-  var peg$c84 = "group-bank-account";
-  var peg$c85 = "group-withdrawn";
-  var peg$c86 = "group-withdrawal-id";
-  var peg$c87 = "group-category";
-  var peg$c88 = "group-tag";
-  var peg$c89 = "group-merchant";
-  var peg$c90 = "group-month";
-  var peg$c91 = "group-week";
-  var peg$c92 = "group-year";
-  var peg$c93 = "group-quarter";
-  var peg$c94 = "!=";
-  var peg$c95 = ">=";
-  var peg$c96 = ">";
-  var peg$c97 = "<=";
-  var peg$c98 = "<";
-  var peg$c99 = "\u201C";
-  var peg$c100 = "\u201D";
-  var peg$c101 = "\"";
-
-  var peg$r0 = /^[^ \t\r\n\xA0]/;
-  var peg$r1 = /^[ \t\r\n\xA0,:=<>!]/;
-  var peg$r2 = /^[:=]/;
-  var peg$r3 = /^[^ ,\t\n\r\xA0]/;
-  var peg$r4 = /^[ \t\r\n\xA0]/;
-  var peg$r5 = /^[^ ,"\u201D\u201C\t\n\r\xA0]/;
-  var peg$r6 = /^["\u201C-\u201D]/;
-  var peg$r7 = /^[^"\u201D\u201C\r\n]/;
-  var peg$r8 = /^[ \t\n\r\xA0a-zA-Z0-9]/;
-  var peg$r9 = /^[a-zA-Z0-9]/;
-  var peg$r10 = /^[ \t\n\r\xA0]/;
-  var peg$r11 = /^[ \t\n\r\xA0a-zA-Z]/;
-  var peg$r12 = /^[,]/;
-  var peg$r13 = /^[ \t\n\r\xA0,]/;
-
-  var peg$e0 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], true, false);
-  var peg$e1 = peg$literalExpectation("-", false);
-  var peg$e2 = peg$literalExpectation("report-field", true);
-  var peg$e3 = peg$literalExpectation("reportfield", true);
-  var peg$e4 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0", ",", ":", "=", "<", ">", "!"], false, false);
-  var peg$e5 = peg$anyExpectation();
-  var peg$e6 = peg$otherExpectation("key");
-  var peg$e7 = peg$otherExpectation("default key");
-  var peg$e8 = peg$literalExpectation(",", false);
-  var peg$e9 = peg$literalExpectation("date", true);
-  var peg$e10 = peg$literalExpectation("amount", true);
-  var peg$e11 = peg$literalExpectation("merchant", true);
-  var peg$e12 = peg$literalExpectation("description", true);
-  var peg$e13 = peg$literalExpectation("reportid", true);
-  var peg$e14 = peg$literalExpectation("report-id", true);
-  var peg$e15 = peg$literalExpectation("keyword", true);
-  var peg$e16 = peg$literalExpectation("in", true);
-  var peg$e17 = peg$literalExpectation("currency", true);
-  var peg$e18 = peg$literalExpectation("groupCurrency", false);
-  var peg$e19 = peg$literalExpectation("group-currency", true);
-  var peg$e20 = peg$literalExpectation("tag", true);
-  var peg$e21 = peg$literalExpectation("category", true);
-  var peg$e22 = peg$literalExpectation("to", true);
-  var peg$e23 = peg$literalExpectation("exporter", true);
-  var peg$e24 = peg$literalExpectation("payer", true);
-  var peg$e25 = peg$literalExpectation("taxRate", true);
-  var peg$e26 = peg$literalExpectation("tax-rate", true);
-  var peg$e27 = peg$literalExpectation("cardID", false);
-  var peg$e28 = peg$literalExpectation("card", true);
-  var peg$e29 = peg$literalExpectation("from", true);
-  var peg$e30 = peg$literalExpectation("attendee", true);
-  var peg$e31 = peg$literalExpectation("expenseType", false);
-  var peg$e32 = peg$literalExpectation("expense-type", true);
-  var peg$e33 = peg$literalExpectation("withdrawalType", false);
-  var peg$e34 = peg$literalExpectation("withdrawal-type", true);
-  var peg$e35 = peg$literalExpectation("withdrawalID", true);
-  var peg$e36 = peg$literalExpectation("withdrawal-id", true);
-  var peg$e37 = peg$literalExpectation("billable", true);
-  var peg$e38 = peg$literalExpectation("reimbursable", true);
-  var peg$e39 = peg$literalExpectation("type", true);
-  var peg$e40 = peg$literalExpectation("status", true);
-  var peg$e41 = peg$literalExpectation("sortBy", false);
-  var peg$e42 = peg$literalExpectation("sort-by", true);
-  var peg$e43 = peg$literalExpectation("sortOrder", false);
-  var peg$e44 = peg$literalExpectation("sort-order", true);
-  var peg$e45 = peg$literalExpectation("policyID", false);
-  var peg$e46 = peg$literalExpectation("workspace", true);
-  var peg$e47 = peg$literalExpectation("submitted", true);
-  var peg$e48 = peg$literalExpectation("approved", true);
-  var peg$e49 = peg$literalExpectation("paid", true);
-  var peg$e50 = peg$literalExpectation("exported", true);
-  var peg$e51 = peg$literalExpectation("posted", true);
-  var peg$e52 = peg$literalExpectation("withdrawn", true);
-  var peg$e53 = peg$literalExpectation("groupBy", true);
-  var peg$e54 = peg$literalExpectation("group-by", true);
-  var peg$e55 = peg$literalExpectation("limit", true);
-  var peg$e56 = peg$literalExpectation("feed", true);
-  var peg$e57 = peg$literalExpectation("title", true);
-  var peg$e58 = peg$literalExpectation("assignee", true);
-  var peg$e59 = peg$literalExpectation("createdBy", true);
-  var peg$e60 = peg$literalExpectation("created-by", true);
-  var peg$e61 = peg$literalExpectation("action", true);
-  var peg$e62 = peg$literalExpectation("total", true);
-  var peg$e63 = peg$literalExpectation("has", true);
-  var peg$e64 = peg$literalExpectation("is", true);
-  var peg$e65 = peg$literalExpectation("purchaseAmount", true);
-  var peg$e66 = peg$literalExpectation("purchase-amount", true);
-  var peg$e67 = peg$literalExpectation("purchaseCurrency", true);
-  var peg$e68 = peg$literalExpectation("purchase-currency", true);
-  var peg$e69 = peg$literalExpectation("columns", true);
-  var peg$e70 = peg$literalExpectation("view", true);
-  var peg$e71 = peg$literalExpectation("per-diem", true);
-  var peg$e72 = peg$literalExpectation("drafts", true);
-  var peg$e73 = peg$literalExpectation("draft", true);
-  var peg$e74 = peg$literalExpectation("original-amount", true);
-  var peg$e75 = peg$literalExpectation("tax", true);
-  var peg$e76 = peg$literalExpectation("policy-name", true);
-  var peg$e77 = peg$literalExpectation("bank-account", true);
-  var peg$e78 = peg$literalExpectation("long-report-id", true);
-  var peg$e79 = peg$literalExpectation("exported-to", true);
-  var peg$e80 = peg$classExpectation([":", "="], false, false);
-  var peg$e81 = peg$literalExpectation("exportedTo", true);
-  var peg$e82 = peg$literalExpectation("exchange-rate", true);
-  var peg$e83 = peg$literalExpectation("reimbursable-total", true);
-  var peg$e84 = peg$literalExpectation("non-reimbursable-total", true);
-  var peg$e85 = peg$literalExpectation("group-from", true);
-  var peg$e86 = peg$literalExpectation("group-expenses", true);
-  var peg$e87 = peg$literalExpectation("group-total", true);
-  var peg$e88 = peg$literalExpectation("group-card", true);
-  var peg$e89 = peg$literalExpectation("group-feed", true);
-  var peg$e90 = peg$literalExpectation("group-bank-account", true);
-  var peg$e91 = peg$literalExpectation("group-withdrawn", true);
-  var peg$e92 = peg$literalExpectation("group-withdrawal-id", true);
-  var peg$e93 = peg$literalExpectation("group-category", true);
-  var peg$e94 = peg$literalExpectation("group-tag", true);
-  var peg$e95 = peg$literalExpectation("group-merchant", true);
-  var peg$e96 = peg$literalExpectation("group-month", true);
-  var peg$e97 = peg$literalExpectation("group-week", true);
-  var peg$e98 = peg$literalExpectation("group-year", true);
-  var peg$e99 = peg$literalExpectation("group-quarter", true);
-  var peg$e100 = peg$otherExpectation("operator");
-  var peg$e101 = peg$literalExpectation("!=", false);
-  var peg$e102 = peg$literalExpectation(">=", false);
-  var peg$e103 = peg$literalExpectation(">", false);
-  var peg$e104 = peg$literalExpectation("<=", false);
-  var peg$e105 = peg$literalExpectation("<", false);
-  var peg$e106 = peg$otherExpectation("word");
-  var peg$e107 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e108 = peg$otherExpectation("whitespace");
-  var peg$e109 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
-  var peg$e110 = peg$otherExpectation("quote");
-  var peg$e111 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e112 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
-  var peg$e113 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
-  var peg$e114 = peg$literalExpectation("\u201C", false);
-  var peg$e115 = peg$literalExpectation("\u201D", false);
-  var peg$e116 = peg$literalExpectation("\"", false);
-  var peg$e117 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e118 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e119 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
-  var peg$e120 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
-  var peg$e121 = peg$classExpectation([","], false, false);
-  var peg$e122 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false);
-
-  var peg$f0 = function(filters) { return applyDefaults(filters); };
-  var peg$f1 = function(head, tail) {
-      const allFilters = [head, ...tail.map(([_, filter]) => filter)]
-        .filter(Boolean)
-        .filter((filter) => filter.right);
-      rawFilterList = allFilters.map(createRawFilter).filter(Boolean);
-
-      const filtersWithoutDefaults = allFilters.filter((filter) => !filter.isDefault);
-
-      if (!filtersWithoutDefaults.length) {
-        return null;
-      }
-
-      const keywords = filtersWithoutDefaults.filter(
-        (filter) =>
-          filter.left === "keyword" || filter.right?.left === "keyword"
-      );
-      const nonKeywords = filtersWithoutDefaults.filter(
-        (filter) =>
-          filter.left !== "keyword" && filter.right?.left !== "keyword"
-      );
-
-      const keywordFilter = buildFilter(
-        "eq",
-        "keyword",
-        keywords
-          .map((filter) => filter.right.replaceAll(/^(['"])(.*)\1$/g, "$2"))
-          .flat()
-      );
-      if (keywordFilter.right.length > 0) {
-        nonKeywords.push(keywordFilter);
-      }
-      return nonKeywords.reduce((result, filter) =>
-        buildFilter("and", result, filter)
-      );
-    };
-  var peg$f2 = function(key, op, value) {
-      updateDefaultValues(key, value);
-      return {...buildFilter(op, key, value), isDefault: true};
-    };
-  var peg$f3 = function(value) {
-      //handle no-breaking space
-      let word;
-      if (Array.isArray(value)) {
-        word = value.join("");
-      } else {
-        word = value;
-      }
-      return buildFilter("eq", "keyword", word);
-    };
-  var peg$f4 = function(neg, field, op, values) {
-      expectingNestedQuote = false; nameOperator = false;
+  const peg$FAILED = {};
+  const peg$source = options.grammarSource;
 
-      const key = field;
-      let operator = op;
+  const peg$startRuleFunctions = {
+    query: peg$parsequery,
+  };
+  let peg$startRuleFunction = peg$parsequery;
+
+  const peg$c0 = "-";
+  const peg$c1 = "report-field";
+  const peg$c2 = "reportfield";
+  const peg$c3 = ",";
+  const peg$c4 = "date";
+  const peg$c5 = "amount";
+  const peg$c6 = "merchant";
+  const peg$c7 = "description";
+  const peg$c8 = "reportid";
+  const peg$c9 = "report-id";
+  const peg$c10 = "keyword";
+  const peg$c11 = "in";
+  const peg$c12 = "currency";
+  const peg$c13 = "groupCurrency";
+  const peg$c14 = "group-currency";
+  const peg$c15 = "tag";
+  const peg$c16 = "category";
+  const peg$c17 = "to";
+  const peg$c18 = "exporter";
+  const peg$c19 = "payer";
+  const peg$c20 = "taxrate";
+  const peg$c21 = "tax-rate";
+  const peg$c22 = "cardID";
+  const peg$c23 = "card";
+  const peg$c24 = "from";
+  const peg$c25 = "attendee";
+  const peg$c26 = "expenseType";
+  const peg$c27 = "expense-type";
+  const peg$c28 = "withdrawalType";
+  const peg$c29 = "withdrawal-type";
+  const peg$c30 = "withdrawalid";
+  const peg$c31 = "withdrawal-id";
+  const peg$c32 = "billable";
+  const peg$c33 = "reimbursable";
+  const peg$c34 = "type";
+  const peg$c35 = "status";
+  const peg$c36 = "sortBy";
+  const peg$c37 = "sort-by";
+  const peg$c38 = "sortOrder";
+  const peg$c39 = "sort-order";
+  const peg$c40 = "policyID";
+  const peg$c41 = "workspace";
+  const peg$c42 = "submitted";
+  const peg$c43 = "approved";
+  const peg$c44 = "paid";
+  const peg$c45 = "exported";
+  const peg$c46 = "posted";
+  const peg$c47 = "withdrawn";
+  const peg$c48 = "groupby";
+  const peg$c49 = "group-by";
+  const peg$c50 = "limit";
+  const peg$c51 = "feed";
+  const peg$c52 = "title";
+  const peg$c53 = "assignee";
+  const peg$c54 = "createdby";
+  const peg$c55 = "created-by";
+  const peg$c56 = "action";
+  const peg$c57 = "total";
+  const peg$c58 = "has";
+  const peg$c59 = "is";
+  const peg$c60 = "purchaseamount";
+  const peg$c61 = "purchase-amount";
+  const peg$c62 = "purchasecurrency";
+  const peg$c63 = "purchase-currency";
+  const peg$c64 = "columns";
+  const peg$c65 = "view";
+  const peg$c66 = "per-diem";
+  const peg$c67 = "drafts";
+  const peg$c68 = "draft";
+  const peg$c69 = "original-amount";
+  const peg$c70 = "tax";
+  const peg$c71 = "policy-name";
+  const peg$c72 = "bank-account";
+  const peg$c73 = "long-report-id";
+  const peg$c74 = "exported-to";
+  const peg$c75 = "exportedto";
+  const peg$c76 = "exchange-rate";
+  const peg$c77 = "reimbursable-total";
+  const peg$c78 = "non-reimbursable-total";
+  const peg$c79 = "group-from";
+  const peg$c80 = "group-expenses";
+  const peg$c81 = "group-total";
+  const peg$c82 = "group-card";
+  const peg$c83 = "group-feed";
+  const peg$c84 = "group-bank-account";
+  const peg$c85 = "group-withdrawn";
+  const peg$c86 = "group-withdrawal-id";
+  const peg$c87 = "group-category";
+  const peg$c88 = "group-tag";
+  const peg$c89 = "group-merchant";
+  const peg$c90 = "group-month";
+  const peg$c91 = "group-week";
+  const peg$c92 = "group-year";
+  const peg$c93 = "group-quarter";
+  const peg$c94 = "*:";
+  const peg$c95 = "!=";
+  const peg$c96 = ">=";
+  const peg$c97 = ">";
+  const peg$c98 = "<=";
+  const peg$c99 = "<";
+  const peg$c100 = "\u201C";
+  const peg$c101 = "\u201D";
+  const peg$c102 = "\"";
+
+  const peg$r0 = /^[^ \t\r\n\xA0]/;
+  const peg$r1 = /^[ \t\r\n\xA0,:=<>!]/;
+  const peg$r2 = /^[:=]/;
+  const peg$r3 = /^[^ ,\t\n\r\xA0]/;
+  const peg$r4 = /^[ \t\r\n\xA0]/;
+  const peg$r5 = /^[^ ,"\u201D\u201C\t\n\r\xA0]/;
+  const peg$r6 = /^["\u201C-\u201D]/;
+  const peg$r7 = /^[^"\u201D\u201C\r\n]/;
+  const peg$r8 = /^[ \t\n\r\xA0a-zA-Z0-9]/;
+  const peg$r9 = /^[a-zA-Z0-9]/;
+  const peg$r10 = /^[ \t\n\r\xA0]/;
+  const peg$r11 = /^[ \t\n\r\xA0a-zA-Z]/;
+  const peg$r12 = /^[,]/;
+  const peg$r13 = /^[ \t\n\r\xA0,]/;
+
+  const peg$e0 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], true, false, false);
+  const peg$e1 = peg$literalExpectation("-", false);
+  const peg$e2 = peg$literalExpectation("report-field", true);
+  const peg$e3 = peg$literalExpectation("reportfield", true);
+  const peg$e4 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0", ",", ":", "=", "<", ">", "!"], false, false, false);
+  const peg$e5 = peg$anyExpectation();
+  const peg$e6 = peg$otherExpectation("key");
+  const peg$e7 = peg$otherExpectation("default key");
+  const peg$e8 = peg$literalExpectation(",", false);
+  const peg$e9 = peg$literalExpectation("date", true);
+  const peg$e10 = peg$literalExpectation("amount", true);
+  const peg$e11 = peg$literalExpectation("merchant", true);
+  const peg$e12 = peg$literalExpectation("description", true);
+  const peg$e13 = peg$literalExpectation("reportid", true);
+  const peg$e14 = peg$literalExpectation("report-id", true);
+  const peg$e15 = peg$literalExpectation("keyword", true);
+  const peg$e16 = peg$literalExpectation("in", true);
+  const peg$e17 = peg$literalExpectation("currency", true);
+  const peg$e18 = peg$literalExpectation("groupCurrency", false);
+  const peg$e19 = peg$literalExpectation("group-currency", true);
+  const peg$e20 = peg$literalExpectation("tag", true);
+  const peg$e21 = peg$literalExpectation("category", true);
+  const peg$e22 = peg$literalExpectation("to", true);
+  const peg$e23 = peg$literalExpectation("exporter", true);
+  const peg$e24 = peg$literalExpectation("payer", true);
+  const peg$e25 = peg$literalExpectation("taxRate", true);
+  const peg$e26 = peg$literalExpectation("tax-rate", true);
+  const peg$e27 = peg$literalExpectation("cardID", false);
+  const peg$e28 = peg$literalExpectation("card", true);
+  const peg$e29 = peg$literalExpectation("from", true);
+  const peg$e30 = peg$literalExpectation("attendee", true);
+  const peg$e31 = peg$literalExpectation("expenseType", false);
+  const peg$e32 = peg$literalExpectation("expense-type", true);
+  const peg$e33 = peg$literalExpectation("withdrawalType", false);
+  const peg$e34 = peg$literalExpectation("withdrawal-type", true);
+  const peg$e35 = peg$literalExpectation("withdrawalID", true);
+  const peg$e36 = peg$literalExpectation("withdrawal-id", true);
+  const peg$e37 = peg$literalExpectation("billable", true);
+  const peg$e38 = peg$literalExpectation("reimbursable", true);
+  const peg$e39 = peg$literalExpectation("type", true);
+  const peg$e40 = peg$literalExpectation("status", true);
+  const peg$e41 = peg$literalExpectation("sortBy", false);
+  const peg$e42 = peg$literalExpectation("sort-by", true);
+  const peg$e43 = peg$literalExpectation("sortOrder", false);
+  const peg$e44 = peg$literalExpectation("sort-order", true);
+  const peg$e45 = peg$literalExpectation("policyID", false);
+  const peg$e46 = peg$literalExpectation("workspace", true);
+  const peg$e47 = peg$literalExpectation("submitted", true);
+  const peg$e48 = peg$literalExpectation("approved", true);
+  const peg$e49 = peg$literalExpectation("paid", true);
+  const peg$e50 = peg$literalExpectation("exported", true);
+  const peg$e51 = peg$literalExpectation("posted", true);
+  const peg$e52 = peg$literalExpectation("withdrawn", true);
+  const peg$e53 = peg$literalExpectation("groupBy", true);
+  const peg$e54 = peg$literalExpectation("group-by", true);
+  const peg$e55 = peg$literalExpectation("limit", true);
+  const peg$e56 = peg$literalExpectation("feed", true);
+  const peg$e57 = peg$literalExpectation("title", true);
+  const peg$e58 = peg$literalExpectation("assignee", true);
+  const peg$e59 = peg$literalExpectation("createdBy", true);
+  const peg$e60 = peg$literalExpectation("created-by", true);
+  const peg$e61 = peg$literalExpectation("action", true);
+  const peg$e62 = peg$literalExpectation("total", true);
+  const peg$e63 = peg$literalExpectation("has", true);
+  const peg$e64 = peg$literalExpectation("is", true);
+  const peg$e65 = peg$literalExpectation("purchaseAmount", true);
+  const peg$e66 = peg$literalExpectation("purchase-amount", true);
+  const peg$e67 = peg$literalExpectation("purchaseCurrency", true);
+  const peg$e68 = peg$literalExpectation("purchase-currency", true);
+  const peg$e69 = peg$literalExpectation("columns", true);
+  const peg$e70 = peg$literalExpectation("view", true);
+  const peg$e71 = peg$literalExpectation("per-diem", true);
+  const peg$e72 = peg$literalExpectation("drafts", true);
+  const peg$e73 = peg$literalExpectation("draft", true);
+  const peg$e74 = peg$literalExpectation("original-amount", true);
+  const peg$e75 = peg$literalExpectation("tax", true);
+  const peg$e76 = peg$literalExpectation("policy-name", true);
+  const peg$e77 = peg$literalExpectation("bank-account", true);
+  const peg$e78 = peg$literalExpectation("long-report-id", true);
+  const peg$e79 = peg$literalExpectation("exported-to", true);
+  const peg$e80 = peg$classExpectation([":", "="], false, false, false);
+  const peg$e81 = peg$literalExpectation("exportedTo", true);
+  const peg$e82 = peg$literalExpectation("exchange-rate", true);
+  const peg$e83 = peg$literalExpectation("reimbursable-total", true);
+  const peg$e84 = peg$literalExpectation("non-reimbursable-total", true);
+  const peg$e85 = peg$literalExpectation("group-from", true);
+  const peg$e86 = peg$literalExpectation("group-expenses", true);
+  const peg$e87 = peg$literalExpectation("group-total", true);
+  const peg$e88 = peg$literalExpectation("group-card", true);
+  const peg$e89 = peg$literalExpectation("group-feed", true);
+  const peg$e90 = peg$literalExpectation("group-bank-account", true);
+  const peg$e91 = peg$literalExpectation("group-withdrawn", true);
+  const peg$e92 = peg$literalExpectation("group-withdrawal-id", true);
+  const peg$e93 = peg$literalExpectation("group-category", true);
+  const peg$e94 = peg$literalExpectation("group-tag", true);
+  const peg$e95 = peg$literalExpectation("group-merchant", true);
+  const peg$e96 = peg$literalExpectation("group-month", true);
+  const peg$e97 = peg$literalExpectation("group-week", true);
+  const peg$e98 = peg$literalExpectation("group-year", true);
+  const peg$e99 = peg$literalExpectation("group-quarter", true);
+  const peg$e100 = peg$otherExpectation("operator");
+  const peg$e101 = peg$literalExpectation("*:", false);
+  const peg$e102 = peg$literalExpectation("!=", false);
+  const peg$e103 = peg$literalExpectation(">=", false);
+  const peg$e104 = peg$literalExpectation(">", false);
+  const peg$e105 = peg$literalExpectation("<=", false);
+  const peg$e106 = peg$literalExpectation("<", false);
+  const peg$e107 = peg$otherExpectation("word");
+  const peg$e108 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false, false);
+  const peg$e109 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false, false);
+  const peg$e110 = peg$otherExpectation("quote");
+  const peg$e111 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false, false);
+  const peg$e112 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false, false);
+  const peg$e113 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false, false);
+  const peg$e114 = peg$literalExpectation("\u201C", false);
+  const peg$e115 = peg$literalExpectation("\u201D", false);
+  const peg$e116 = peg$literalExpectation("\"", false);
+  const peg$e117 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false, false);
+  const peg$e118 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false, false);
+  const peg$e119 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false, false);
+  const peg$e120 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false, false);
+  const peg$e121 = peg$classExpectation([","], false, false, false);
+  const peg$e122 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false, false);
+
+  function peg$f0(filters) {    return applyDefaults(filters);  }
+  function peg$f1(head, tail) {
+    const allFilters = [head, ...tail.map(([_, filter]) => filter)]
+      .filter(Boolean)
+      .filter((filter) => filter.right);
+    rawFilterList = allFilters.map(createRawFilter).filter(Boolean);
+
+    const filtersWithoutDefaults = allFilters.filter((filter) => !filter.isDefault);
+
+    if (!filtersWithoutDefaults.length) {
+      return null;
+    }
 
-      // Apply negation only when "-" is present and the key can be negated
-      if (neg && !nonNegatableKeys.has(key)) {
-        if (operator === "eq") {
-          operator = "neq";
-        }
+    const keywords = filtersWithoutDefaults.filter(
+      (filter) =>
+        filter.left === "keyword" || filter.right?.left === "keyword"
+    );
+    const nonKeywords = filtersWithoutDefaults.filter(
+      (filter) =>
+        filter.left !== "keyword" && filter.right?.left !== "keyword"
+    );
+
+    const keywordFilter = buildFilter(
+      "eq",
+      "keyword",
+      keywords
+        .map((filter) => filter.right.replaceAll(/^(['"])(.*)\1$/g, "$2"))
+        .flat()
+    );
+    if (keywordFilter.right.length > 0) {
+      nonKeywords.push(keywordFilter);
+    }
+    return nonKeywords.reduce((result, filter) =>
+      buildFilter("and", result, filter)
+    );
+  }
+  function peg$f2(key, op, value) {
+    updateDefaultValues(key, value);
+    return {...buildFilter(op, key, value), isDefault: true};
+  }
+  function peg$f3(value) {
+    //handle no-breaking space
+    let word;
+    if (Array.isArray(value)) {
+      word = value.join("");
+    } else {
+      word = value;
+    }
+    return buildFilter("eq", "keyword", word);
+  }
+  function peg$f4(neg, field, op, values) {
+    expectingNestedQuote = false; nameOperator = false;
+
+    const key = field;
+    let operator = op;
+
+    // Apply negation only when "-" is present and the key can be negated
+    if (neg && !nonNegatableKeys.has(key)) {
+      if (operator === "eq") {
+        operator = "neq";
       }
+    }
 
-      return buildFilter(operator, key, values);
-    };
-  var peg$f5 = function(rest) {
-      const suffix = rest.replaceAll(/^-+/g, "");
-      return "reportField-" + (suffix ? suffix : "");
-    };
-  var peg$f6 = function(k) {
-      nameOperator = (k === "from" || k === "to" || k === "payer" || k === "exporter" || k === "attendee" || k === "createdBy" || k === "assignee");
-      return k;
-    };
-  var peg$f7 = function(parts, empty) {
-      const value = parts.flat().filter(Boolean).map((word) => {
-        if (word.startsWith('"') && word.endsWith('"') && word.length >= 2) {
-          return word.slice(1, -1);
-        }
-        return word;
-      });
-      if (value.length > 1) {
-        return value.filter((word) => word.length > 0);
+    return buildFilter(operator, key, values);
+  }
+  function peg$f5(rest) {
+    const suffix = rest.replaceAll(/^-+/g, "");
+    return "reportField-" + (suffix ? suffix : "");
+  }
+  function peg$f6(k) {
+    nameOperator = (k === "from" || k === "to" || k === "payer" || k === "exporter" || k === "attendee" || k === "createdBy" || k === "assignee");
+    return k;
+  }
+  function peg$f7(parts, empty) {
+    const value = parts.flat().filter(Boolean).map((word) => {
+      if (word.startsWith('"') && word.endsWith('"') && word.length >= 2) {
+        return word.slice(1, -1);
       }
-      return value[0];
-    };
-  var peg$f8 = function() { return "date"; };
-  var peg$f9 = function() { return "amount"; };
-  var peg$f10 = function() { return "merchant"; };
-  var peg$f11 = function() { return "description"; };
-  var peg$f12 = function() { return "reportID"; };
-  var peg$f13 = function() { return "keyword"; };
-  var peg$f14 = function() { return "in"; };
-  var peg$f15 = function() { return "currency"; };
-  var peg$f16 = function() { return "groupCurrency"; };
-  var peg$f17 = function() { return "tag"; };
-  var peg$f18 = function() { return "category"; };
-  var peg$f19 = function() { return "to"; };
-  var peg$f20 = function() { return "exporter"; };
-  var peg$f21 = function() { return "payer"; };
-  var peg$f22 = function() { return "taxRate"; };
-  var peg$f23 = function() { return "cardID"; };
-  var peg$f24 = function() { return "from"; };
-  var peg$f25 = function() {return "attendee"};
-  var peg$f26 = function() { return "expenseType"; };
-  var peg$f27 = function() { return "withdrawalType"; };
-  var peg$f28 = function() { return "withdrawalID"; };
-  var peg$f29 = function() { return "billable"; };
-  var peg$f30 = function() { return "reimbursable"; };
-  var peg$f31 = function() { return "type"; };
-  var peg$f32 = function() { return "status"; };
-  var peg$f33 = function() { return "sortBy"; };
-  var peg$f34 = function() { return "sortOrder"; };
-  var peg$f35 = function() { return "policyID"; };
-  var peg$f36 = function() { return "submitted"; };
-  var peg$f37 = function() { return "approved"; };
-  var peg$f38 = function() { return "paid"; };
-  var peg$f39 = function() { return "exported"; };
-  var peg$f40 = function() { return "posted"; };
-  var peg$f41 = function() { return "withdrawn"; };
-  var peg$f42 = function() { return "groupBy"; };
-  var peg$f43 = function() { return "limit"; };
-  var peg$f44 = function() { return "feed"; };
-  var peg$f45 = function() { return "title"; };
-  var peg$f46 = function() { return "assignee"; };
-  var peg$f47 = function() { return "createdBy"; };
-  var peg$f48 = function() { return "action"; };
-  var peg$f49 = function() {return "total"; };
-  var peg$f50 = function() {return "has"; };
-  var peg$f51 = function() {return "is"; };
-  var peg$f52 = function() {return "purchaseAmount"};
-  var peg$f53 = function() {return "purchaseCurrency"};
-  var peg$f54 = function() {
-  isColumnsContext = true;
-  return "columns";
-};
-  var peg$f55 = function() {return "view"};
-  var peg$f56 = function() { return isColumnsContext; };
-  var peg$f57 = function() { return "perDiem"; };
-  var peg$f58 = function() { return "drafts"; };
-  var peg$f59 = function() { return "originalamount"; };
-  var peg$f60 = function() { return "taxAmount"; };
-  var peg$f61 = function() { return "taxrate"; };
-  var peg$f62 = function() { return "policyname"; };
-  var peg$f63 = function() { return "withdrawalID"; };
-  var peg$f64 = function() { return "bankAccount"; };
-  var peg$f65 = function() { return "reportID"; };
-  var peg$f66 = function() { return "base62ReportID"; };
-  var peg$f67 = function() { return "exportedto"; };
-  var peg$f68 = function() { return "exportedTo"; };
-  var peg$f69 = function() { return "exportedTo"; };
-  var peg$f70 = function() { return "exchangeRate"; };
-  var peg$f71 = function() { return "reimbursableTotal"; };
-  var peg$f72 = function() { return "nonReimbursableTotal"; };
-  var peg$f73 = function() { return "groupFrom"; };
-  var peg$f74 = function() { return "groupExpenses"; };
-  var peg$f75 = function() { return "groupTotal"; };
-  var peg$f76 = function() { return "groupCard"; };
-  var peg$f77 = function() { return "groupFeed"; };
-  var peg$f78 = function() { return "groupBankAccount"; };
-  var peg$f79 = function() { return "groupWithdrawn"; };
-  var peg$f80 = function() { return "groupWithdrawalID"; };
-  var peg$f81 = function() { return "groupCategory"; };
-  var peg$f82 = function() { return "groupTag"; };
-  var peg$f83 = function() { return "groupMerchant"; };
-  var peg$f84 = function() { return "groupmonth"; };
-  var peg$f85 = function() { return "groupweek"; };
-  var peg$f86 = function() { return "groupyear"; };
-  var peg$f87 = function() { return "groupquarter"; };
-  var peg$f88 = function() { return "eq"; };
-  var peg$f89 = function() { return "neq"; };
-  var peg$f90 = function() { return "gte"; };
-  var peg$f91 = function() { return "gt"; };
-  var peg$f92 = function() { return "lte"; };
-  var peg$f93 = function() { return "lt"; };
-  var peg$f94 = function(o) {
-      if (nameOperator) {
-        expectingNestedQuote = (o === "eq"); // Use simple parser if no valid operator is found
-      }
-      isColumnsContext = false;
-      return o;
-  };
-  var peg$f95 = function(chars) { return chars.join("").trim(); };
-  var peg$f96 = function() { 
-  isColumnsContext = false;
-  return "and";
-};
-  var peg$f97 = function() { return expectingNestedQuote; };
-  var peg$f98 = function(start, inner, end) { //handle no-breaking space
-      return [...start, '"', ...inner, '"', ...end].join("");
-    };
-  var peg$f99 = function(start) {return "“"};
-  var peg$f100 = function(start) {return "”"};
-  var peg$f101 = function(start) {return "\""};
-  var peg$f102 = function(start, inner, end) {
+      return word;
+    });
+    if (value.length > 1) {
+      return value.filter((word) => word.length > 0);
+    }
+    return value[0];
+  }
+  function peg$f8() {    return "date";  }
+  function peg$f9() {    return "amount";  }
+  function peg$f10() {    return "merchant";  }
+  function peg$f11() {    return "description";  }
+  function peg$f12() {    return "reportID";  }
+  function peg$f13() {    return "keyword";  }
+  function peg$f14() {    return "in";  }
+  function peg$f15() {    return "currency";  }
+  function peg$f16() {    return "groupCurrency";  }
+  function peg$f17() {    return "tag";  }
+  function peg$f18() {    return "category";  }
+  function peg$f19() {    return "to";  }
+  function peg$f20() {    return "exporter";  }
+  function peg$f21() {    return "payer";  }
+  function peg$f22() {    return "taxRate";  }
+  function peg$f23() {    return "cardID";  }
+  function peg$f24() {    return "from";  }
+  function peg$f25() {return "attendee"  }
+  function peg$f26() {    return "expenseType";  }
+  function peg$f27() {    return "withdrawalType";  }
+  function peg$f28() {    return "withdrawalID";  }
+  function peg$f29() {    return "billable";  }
+  function peg$f30() {    return "reimbursable";  }
+  function peg$f31() {    return "type";  }
+  function peg$f32() {    return "status";  }
+  function peg$f33() {    return "sortBy";  }
+  function peg$f34() {    return "sortOrder";  }
+  function peg$f35() {    return "policyID";  }
+  function peg$f36() {    return "submitted";  }
+  function peg$f37() {    return "approved";  }
+  function peg$f38() {    return "paid";  }
+  function peg$f39() {    return "exported";  }
+  function peg$f40() {    return "posted";  }
+  function peg$f41() {    return "withdrawn";  }
+  function peg$f42() {    return "groupBy";  }
+  function peg$f43() {    return "limit";  }
+  function peg$f44() {    return "feed";  }
+  function peg$f45() {    return "title";  }
+  function peg$f46() {    return "assignee";  }
+  function peg$f47() {    return "createdBy";  }
+  function peg$f48() {    return "action";  }
+  function peg$f49() {return "total";  }
+  function peg$f50() {return "has";  }
+  function peg$f51() {return "is";  }
+  function peg$f52() {return "purchaseAmount"  }
+  function peg$f53() {return "purchaseCurrency"  }
+  function peg$f54() {
+    isColumnsContext = true;
+    return "columns";
+  }
+  function peg$f55() {return "view"  }
+  function peg$f56() {    return isColumnsContext;  }
+  function peg$f57() {    return "perDiem";  }
+  function peg$f58() {    return "drafts";  }
+  function peg$f59() {    return "originalamount";  }
+  function peg$f60() {    return "taxAmount";  }
+  function peg$f61() {    return "taxrate";  }
+  function peg$f62() {    return "policyname";  }
+  function peg$f63() {    return "withdrawalID";  }
+  function peg$f64() {    return "bankAccount";  }
+  function peg$f65() {    return "reportID";  }
+  function peg$f66() {    return "base62ReportID";  }
+  function peg$f67() {    return "exportedto";  }
+  function peg$f68() {    return "exportedTo";  }
+  function peg$f69() {    return "exportedTo";  }
+  function peg$f70() {    return "exchangeRate";  }
+  function peg$f71() {    return "reimbursableTotal";  }
+  function peg$f72() {    return "nonReimbursableTotal";  }
+  function peg$f73() {    return "groupFrom";  }
+  function peg$f74() {    return "groupExpenses";  }
+  function peg$f75() {    return "groupTotal";  }
+  function peg$f76() {    return "groupCard";  }
+  function peg$f77() {    return "groupFeed";  }
+  function peg$f78() {    return "groupBankAccount";  }
+  function peg$f79() {    return "groupWithdrawn";  }
+  function peg$f80() {    return "groupWithdrawalID";  }
+  function peg$f81() {    return "groupCategory";  }
+  function peg$f82() {    return "groupTag";  }
+  function peg$f83() {    return "groupMerchant";  }
+  function peg$f84() {    return "groupmonth";  }
+  function peg$f85() {    return "groupweek";  }
+  function peg$f86() {    return "groupyear";  }
+  function peg$f87() {    return "groupquarter";  }
+  function peg$f88() {    return "contains";  }
+  function peg$f89() {    return "eq";  }
+  function peg$f90() {    return "neq";  }
+  function peg$f91() {    return "gte";  }
+  function peg$f92() {    return "gt";  }
+  function peg$f93() {    return "lte";  }
+  function peg$f94() {    return "lt";  }
+  function peg$f95(o) {
+    if (nameOperator) {
+      expectingNestedQuote = (o === "eq" || o === "contains");
+    }
+    isColumnsContext = false;
+    return o;
+  }
+  function peg$f96(chars) {    return chars.join("").trim();  }
+  function peg$f97() {    
+     isColumnsContext = false;
+     return "and";
+  }
+  function peg$f98() {    return expectingNestedQuote;  }
+  function peg$f99(start, inner, end) {    //handle no-breaking space
+         return [...start, '"', ...inner, '"', ...end].join("");
+  }
+  function peg$f100(start) {return "“"  }
+  function peg$f101(start) {return "”"  }
+  function peg$f102(start) {return "\""  }
+  function peg$f103(start, inner, end) {
     return [...start, '"', ...inner, '"'].join("");
-};
-  var peg$currPos = options.peg$currPos | 0;
-  var peg$savedPos = peg$currPos;
-  var peg$posDetailsCache = [{ line: 1, column: 1 }];
-  var peg$maxFailPos = peg$currPos;
-  var peg$maxFailExpected = options.peg$maxFailExpected || [];
-  var peg$silentFails = options.peg$silentFails | 0;
+  }
+  let peg$currPos = options.peg$currPos | 0;
+  let peg$savedPos = peg$currPos;
+  const peg$posDetailsCache = [{ line: 1, column: 1 }];
+  let peg$maxFailPos = peg$currPos;
+  let peg$maxFailExpected = options.peg$maxFailExpected || [];
+  let peg$silentFails = options.peg$silentFails | 0;
 
-  var peg$result;
+  let peg$result;
 
   if (options.startRule) {
     if (!(options.startRule in peg$startRuleFunctions)) {
@@ -651,7 +642,7 @@ function peg$parse(input, options) {
     return {
       source: peg$source,
       start: peg$savedPos,
-      end: peg$currPos
+      end: peg$currPos,
     };
   }
 
@@ -679,12 +670,20 @@ function peg$parse(input, options) {
     throw peg$buildSimpleError(message, location);
   }
 
+  function peg$getUnicode(pos = peg$currPos) {
+    const cp = input.codePointAt(pos);
+    if (cp === undefined) {
+      return "";
+    }
+    return String.fromCodePoint(cp);
+  }
+
   function peg$literalExpectation(text, ignoreCase) {
-    return { type: "literal", text: text, ignoreCase: ignoreCase };
+    return { type: "literal", text, ignoreCase };
   }
 
-  function peg$classExpectation(parts, inverted, ignoreCase) {
-    return { type: "class", parts: parts, inverted: inverted, ignoreCase: ignoreCase };
+  function peg$classExpectation(parts, inverted, ignoreCase, unicode) {
+    return { type: "class", parts, inverted, ignoreCase, unicode };
   }
 
   function peg$anyExpectation() {
@@ -696,12 +695,12 @@ function peg$parse(input, options) {
   }
 
   function peg$otherExpectation(description) {
-    return { type: "other", description: description };
+    return { type: "other", description };
   }
 
   function peg$computePosDetails(pos) {
-    var details = peg$posDetailsCache[pos];
-    var p;
+    let details = peg$posDetailsCache[pos];
+    let p;
 
     if (details) {
       return details;
@@ -716,7 +715,7 @@ function peg$parse(input, options) {
       details = peg$posDetailsCache[p];
       details = {
         line: details.line,
-        column: details.column
+        column: details.column,
       };
 
       while (p < pos) {
@@ -737,21 +736,21 @@ function peg$parse(input, options) {
   }
 
   function peg$computeLocation(startPos, endPos, offset) {
-    var startPosDetails = peg$computePosDetails(startPos);
-    var endPosDetails = peg$computePosDetails(endPos);
+    const startPosDetails = peg$computePosDetails(startPos);
+    const endPosDetails = peg$computePosDetails(endPos);
 
-    var res = {
+    const res = {
       source: peg$source,
       start: {
         offset: startPos,
         line: startPosDetails.line,
-        column: startPosDetails.column
+        column: startPosDetails.column,
       },
       end: {
         offset: endPos,
         line: endPosDetails.line,
-        column: endPosDetails.column
-      }
+        column: endPosDetails.column,
+      },
     };
     if (offset && peg$source && (typeof peg$source.offset === "function")) {
       res.start = peg$source.offset(res.start);
@@ -785,7 +784,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsequery() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -801,7 +800,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterList() {
-    var s0, s1, s2, s3, s4, s5;
+    let s0, s1, s2, s3, s4, s5;
 
     s0 = peg$currPos;
     s1 = peg$parsefilter();
@@ -841,7 +840,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilter() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parsestandardFilter();
@@ -862,7 +861,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedefaultFilter() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -893,7 +892,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefreeTextFilter() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -935,7 +934,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsestandardFilter() {
-    var s0, s1, s2, s3, s4, s5, s6, s7;
+    let s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -976,12 +975,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportFieldDynamic() {
-    var s0, s1, s2, s3, s4, s5, s6, s7;
+    let s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
     if (s1.toLowerCase() === peg$c1) {
-      peg$currPos += 12;
+      peg$currPos += (12);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e2); }
@@ -989,7 +988,7 @@ function peg$parse(input, options) {
     if (s1 === peg$FAILED) {
       s1 = input.substr(peg$currPos, 11);
       if (s1.toLowerCase() === peg$c2) {
-        peg$currPos += 11;
+        peg$currPos += (11);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e3); }
@@ -1097,7 +1096,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsekey() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -1238,7 +1237,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterKey() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parsekey();
@@ -1252,7 +1251,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedefaultKey() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -1297,7 +1296,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseidentifier() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     s0 = peg$currPos;
     s1 = [];
@@ -1420,12 +1419,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedate() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c4) {
-      peg$currPos += 4;
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e9); }
@@ -1440,12 +1439,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseamount() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c5) {
-      peg$currPos += 6;
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e10); }
@@ -1460,12 +1459,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsemerchant() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c6) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e11); }
@@ -1480,12 +1479,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedescription() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c7) {
-      peg$currPos += 11;
+      peg$currPos += (11);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e12); }
@@ -1500,11 +1499,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportID() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 8);
     if (s0.toLowerCase() === peg$c8) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e13); }
@@ -1513,7 +1512,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 9);
       if (s1.toLowerCase() === peg$c9) {
-        peg$currPos += 9;
+        peg$currPos += (9);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e14); }
@@ -1529,12 +1528,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsekeyword() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 7);
     if (s1.toLowerCase() === peg$c10) {
-      peg$currPos += 7;
+      peg$currPos += (7);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e15); }
@@ -1549,12 +1548,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsein() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
     if (s1.toLowerCase() === peg$c11) {
-      peg$currPos += 2;
+      peg$currPos += (2);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e16); }
@@ -1569,12 +1568,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecurrency() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c12) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e17); }
@@ -1589,7 +1588,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupCurrency() {
-    var s0, s1;
+    let s0, s1;
 
     if (input.substr(peg$currPos, 13) === peg$c13) {
       s0 = peg$c13;
@@ -1602,7 +1601,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 14);
       if (s1.toLowerCase() === peg$c14) {
-        peg$currPos += 14;
+        peg$currPos += (14);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e19); }
@@ -1618,12 +1617,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetag() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
     if (s1.toLowerCase() === peg$c15) {
-      peg$currPos += 3;
+      peg$currPos += (3);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e20); }
@@ -1638,12 +1637,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecategory() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c16) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e21); }
@@ -1658,12 +1657,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseto() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
     if (s1.toLowerCase() === peg$c17) {
-      peg$currPos += 2;
+      peg$currPos += (2);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e22); }
@@ -1678,12 +1677,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexporter() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c18) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e23); }
@@ -1698,12 +1697,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepayer() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
     if (s1.toLowerCase() === peg$c19) {
-      peg$currPos += 5;
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e24); }
@@ -1718,11 +1717,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetaxRate() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
     if (s0.toLowerCase() === peg$c20) {
-      peg$currPos += 7;
+      peg$currPos += (7);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e25); }
@@ -1731,7 +1730,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
       if (s1.toLowerCase() === peg$c21) {
-        peg$currPos += 8;
+        peg$currPos += (8);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e26); }
@@ -1747,7 +1746,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecardID() {
-    var s0, s1;
+    let s0, s1;
 
     if (input.substr(peg$currPos, 6) === peg$c22) {
       s0 = peg$c22;
@@ -1760,7 +1759,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 4);
       if (s1.toLowerCase() === peg$c23) {
-        peg$currPos += 4;
+        peg$currPos += (4);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e28); }
@@ -1776,12 +1775,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefrom() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c24) {
-      peg$currPos += 4;
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e29); }
@@ -1796,12 +1795,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseattendee() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c25) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e30); }
@@ -1816,7 +1815,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexpenseType() {
-    var s0, s1;
+    let s0, s1;
 
     if (input.substr(peg$currPos, 11) === peg$c26) {
       s0 = peg$c26;
@@ -1829,7 +1828,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 12);
       if (s1.toLowerCase() === peg$c27) {
-        peg$currPos += 12;
+        peg$currPos += (12);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e32); }
@@ -1845,7 +1844,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalType() {
-    var s0, s1;
+    let s0, s1;
 
     if (input.substr(peg$currPos, 14) === peg$c28) {
       s0 = peg$c28;
@@ -1858,7 +1857,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 15);
       if (s1.toLowerCase() === peg$c29) {
-        peg$currPos += 15;
+        peg$currPos += (15);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e34); }
@@ -1874,11 +1873,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalID() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 12);
     if (s0.toLowerCase() === peg$c30) {
-      peg$currPos += 12;
+      peg$currPos += (12);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e35); }
@@ -1887,7 +1886,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 13);
       if (s1.toLowerCase() === peg$c31) {
-        peg$currPos += 13;
+        peg$currPos += (13);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e36); }
@@ -1903,12 +1902,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsebillable() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c32) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e37); }
@@ -1923,12 +1922,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereimbursable() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
     if (s1.toLowerCase() === peg$c33) {
-      peg$currPos += 12;
+      peg$currPos += (12);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e38); }
@@ -1943,12 +1942,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetype() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c34) {
-      peg$currPos += 4;
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e39); }
@@ -1963,12 +1962,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsestatus() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c35) {
-      peg$currPos += 6;
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e40); }
@@ -1983,7 +1982,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesortBy() {
-    var s0, s1;
+    let s0, s1;
 
     if (input.substr(peg$currPos, 6) === peg$c36) {
       s0 = peg$c36;
@@ -1996,7 +1995,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 7);
       if (s1.toLowerCase() === peg$c37) {
-        peg$currPos += 7;
+        peg$currPos += (7);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e42); }
@@ -2012,7 +2011,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesortOrder() {
-    var s0, s1;
+    let s0, s1;
 
     if (input.substr(peg$currPos, 9) === peg$c38) {
       s0 = peg$c38;
@@ -2025,7 +2024,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 10);
       if (s1.toLowerCase() === peg$c39) {
-        peg$currPos += 10;
+        peg$currPos += (10);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e44); }
@@ -2041,7 +2040,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepolicyID() {
-    var s0, s1;
+    let s0, s1;
 
     if (input.substr(peg$currPos, 8) === peg$c40) {
       s0 = peg$c40;
@@ -2054,7 +2053,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 9);
       if (s1.toLowerCase() === peg$c41) {
-        peg$currPos += 9;
+        peg$currPos += (9);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e46); }
@@ -2070,12 +2069,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesubmitted() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
     if (s1.toLowerCase() === peg$c42) {
-      peg$currPos += 9;
+      peg$currPos += (9);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e47); }
@@ -2090,12 +2089,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseapproved() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c43) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e48); }
@@ -2110,12 +2109,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepaid() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c44) {
-      peg$currPos += 4;
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e49); }
@@ -2130,12 +2129,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexported() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c45) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e50); }
@@ -2150,12 +2149,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseposted() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c46) {
-      peg$currPos += 6;
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e51); }
@@ -2170,12 +2169,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawn() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
     if (s1.toLowerCase() === peg$c47) {
-      peg$currPos += 9;
+      peg$currPos += (9);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e52); }
@@ -2190,11 +2189,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupBy() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
     if (s0.toLowerCase() === peg$c48) {
-      peg$currPos += 7;
+      peg$currPos += (7);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e53); }
@@ -2203,7 +2202,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
       if (s1.toLowerCase() === peg$c49) {
-        peg$currPos += 8;
+        peg$currPos += (8);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e54); }
@@ -2219,12 +2218,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parselimit() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
     if (s1.toLowerCase() === peg$c50) {
-      peg$currPos += 5;
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e55); }
@@ -2239,12 +2238,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefeed() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c51) {
-      peg$currPos += 4;
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e56); }
@@ -2259,12 +2258,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetitle() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
     if (s1.toLowerCase() === peg$c52) {
-      peg$currPos += 5;
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e57); }
@@ -2279,12 +2278,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseassignee() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c53) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e58); }
@@ -2299,11 +2298,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecreatedBy() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 9);
     if (s0.toLowerCase() === peg$c54) {
-      peg$currPos += 9;
+      peg$currPos += (9);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e59); }
@@ -2312,7 +2311,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 10);
       if (s1.toLowerCase() === peg$c55) {
-        peg$currPos += 10;
+        peg$currPos += (10);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e60); }
@@ -2328,12 +2327,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseaction() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c56) {
-      peg$currPos += 6;
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e61); }
@@ -2348,12 +2347,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetotal() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
     if (s1.toLowerCase() === peg$c57) {
-      peg$currPos += 5;
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e62); }
@@ -2368,12 +2367,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsehas() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
     if (s1.toLowerCase() === peg$c58) {
-      peg$currPos += 3;
+      peg$currPos += (3);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e63); }
@@ -2388,12 +2387,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseis() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
     if (s1.toLowerCase() === peg$c59) {
-      peg$currPos += 2;
+      peg$currPos += (2);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e64); }
@@ -2408,11 +2407,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepurchaseAmount() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 14);
     if (s0.toLowerCase() === peg$c60) {
-      peg$currPos += 14;
+      peg$currPos += (14);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e65); }
@@ -2421,7 +2420,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 15);
       if (s1.toLowerCase() === peg$c61) {
-        peg$currPos += 15;
+        peg$currPos += (15);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e66); }
@@ -2437,11 +2436,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepurchaseCurrency() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 16);
     if (s0.toLowerCase() === peg$c62) {
-      peg$currPos += 16;
+      peg$currPos += (16);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e67); }
@@ -2450,7 +2449,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 17);
       if (s1.toLowerCase() === peg$c63) {
-        peg$currPos += 17;
+        peg$currPos += (17);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e68); }
@@ -2466,12 +2465,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecolumns() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 7);
     if (s1.toLowerCase() === peg$c64) {
-      peg$currPos += 7;
+      peg$currPos += (7);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e69); }
@@ -2486,12 +2485,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseview() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c65) {
-      peg$currPos += 4;
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e70); }
@@ -2506,7 +2505,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsevalues() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
@@ -2540,7 +2539,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecolumnsValues() {
-    var s0;
+    let s0;
 
     s0 = peg$parseoriginalAmount();
     if (s0 === peg$FAILED) {
@@ -2626,12 +2625,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseperDiem() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c66) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e71); }
@@ -2663,12 +2662,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedraft() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c67) {
-      peg$currPos += 6;
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e72); }
@@ -2676,7 +2675,7 @@ function peg$parse(input, options) {
     if (s1 === peg$FAILED) {
       s1 = input.substr(peg$currPos, 5);
       if (s1.toLowerCase() === peg$c68) {
-        peg$currPos += 5;
+        peg$currPos += (5);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e73); }
@@ -2709,12 +2708,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseoriginalAmount() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 15);
     if (s1.toLowerCase() === peg$c69) {
-      peg$currPos += 15;
+      peg$currPos += (15);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e74); }
@@ -2746,12 +2745,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetaxAmount() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
     if (s1.toLowerCase() === peg$c70) {
-      peg$currPos += 3;
+      peg$currPos += (3);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e75); }
@@ -2783,12 +2782,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetaxRateValue() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c21) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e26); }
@@ -2820,12 +2819,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepolicyName() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c71) {
-      peg$currPos += 11;
+      peg$currPos += (11);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e76); }
@@ -2857,12 +2856,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalId() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 13);
     if (s1.toLowerCase() === peg$c31) {
-      peg$currPos += 13;
+      peg$currPos += (13);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e36); }
@@ -2894,12 +2893,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsebankAccount() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
     if (s1.toLowerCase() === peg$c72) {
-      peg$currPos += 12;
+      peg$currPos += (12);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e77); }
@@ -2931,12 +2930,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportId() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
     if (s1.toLowerCase() === peg$c73) {
-      peg$currPos += 14;
+      peg$currPos += (14);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e78); }
@@ -2968,12 +2967,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsebase62ReportId() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
     if (s1.toLowerCase() === peg$c9) {
-      peg$currPos += 9;
+      peg$currPos += (9);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e14); }
@@ -3005,12 +3004,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexportedToColumnValue() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c74) {
-      peg$currPos += 11;
+      peg$currPos += (11);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e79); }
@@ -3042,7 +3041,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexportedToKeyEnd() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     s0 = peg$parsewordBoundary();
     if (s0 === peg$FAILED) {
@@ -3068,12 +3067,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexportedTo() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c75) {
-      peg$currPos += 10;
+      peg$currPos += (10);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e81); }
@@ -3104,7 +3103,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 11);
       if (s1.toLowerCase() === peg$c74) {
-        peg$currPos += 11;
+        peg$currPos += (11);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e79); }
@@ -3137,12 +3136,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexchangeRate() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 13);
     if (s1.toLowerCase() === peg$c76) {
-      peg$currPos += 13;
+      peg$currPos += (13);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e82); }
@@ -3174,12 +3173,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereimbursableTotal() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 18);
     if (s1.toLowerCase() === peg$c77) {
-      peg$currPos += 18;
+      peg$currPos += (18);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e83); }
@@ -3211,12 +3210,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsenonReimbursableTotal() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 22);
     if (s1.toLowerCase() === peg$c78) {
-      peg$currPos += 22;
+      peg$currPos += (22);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e84); }
@@ -3248,12 +3247,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupFrom() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c79) {
-      peg$currPos += 10;
+      peg$currPos += (10);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e85); }
@@ -3285,12 +3284,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupExpenses() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
     if (s1.toLowerCase() === peg$c80) {
-      peg$currPos += 14;
+      peg$currPos += (14);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e86); }
@@ -3322,12 +3321,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupTotal() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c81) {
-      peg$currPos += 11;
+      peg$currPos += (11);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e87); }
@@ -3359,12 +3358,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupCard() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c82) {
-      peg$currPos += 10;
+      peg$currPos += (10);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e88); }
@@ -3396,12 +3395,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupFeed() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c83) {
-      peg$currPos += 10;
+      peg$currPos += (10);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e89); }
@@ -3433,12 +3432,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupBankAccount() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 18);
     if (s1.toLowerCase() === peg$c84) {
-      peg$currPos += 18;
+      peg$currPos += (18);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e90); }
@@ -3470,12 +3469,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupWithdrawn() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 15);
     if (s1.toLowerCase() === peg$c85) {
-      peg$currPos += 15;
+      peg$currPos += (15);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e91); }
@@ -3507,12 +3506,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupWithdrawalId() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 19);
     if (s1.toLowerCase() === peg$c86) {
-      peg$currPos += 19;
+      peg$currPos += (19);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e92); }
@@ -3544,12 +3543,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupCategory() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
     if (s1.toLowerCase() === peg$c87) {
-      peg$currPos += 14;
+      peg$currPos += (14);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e93); }
@@ -3581,12 +3580,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupTag() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
     if (s1.toLowerCase() === peg$c88) {
-      peg$currPos += 9;
+      peg$currPos += (9);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e94); }
@@ -3618,12 +3617,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupMerchant() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
     if (s1.toLowerCase() === peg$c89) {
-      peg$currPos += 14;
+      peg$currPos += (14);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e95); }
@@ -3655,12 +3654,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupMonth() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c90) {
-      peg$currPos += 11;
+      peg$currPos += (11);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e96); }
@@ -3692,12 +3691,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupWeek() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c91) {
-      peg$currPos += 10;
+      peg$currPos += (10);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e97); }
@@ -3729,12 +3728,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupYear() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c92) {
-      peg$currPos += 10;
+      peg$currPos += (10);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e98); }
@@ -3766,12 +3765,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupQuarter() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 13);
     if (s1.toLowerCase() === peg$c93) {
-      peg$currPos += 13;
+      peg$currPos += (13);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e99); }
@@ -3803,16 +3802,16 @@ function peg$parse(input, options) {
   }
 
   function peg$parseoperator() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
-    s1 = input.charAt(peg$currPos);
-    if (peg$r2.test(s1)) {
-      peg$currPos++;
+    if (input.substr(peg$currPos, 2) === peg$c94) {
+      s1 = peg$c94;
+      peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e80); }
+      if (peg$silentFails === 0) { peg$fail(peg$e101); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -3821,12 +3820,12 @@ function peg$parse(input, options) {
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c94) {
-        s1 = peg$c94;
-        peg$currPos += 2;
+      s1 = input.charAt(peg$currPos);
+      if (peg$r2.test(s1)) {
+        peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e101); }
+        if (peg$silentFails === 0) { peg$fail(peg$e80); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
@@ -3849,9 +3848,9 @@ function peg$parse(input, options) {
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
-          if (input.charCodeAt(peg$currPos) === 62) {
+          if (input.substr(peg$currPos, 2) === peg$c96) {
             s1 = peg$c96;
-            peg$currPos++;
+            peg$currPos += 2;
           } else {
             s1 = peg$FAILED;
             if (peg$silentFails === 0) { peg$fail(peg$e103); }
@@ -3863,9 +3862,9 @@ function peg$parse(input, options) {
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 2) === peg$c97) {
+            if (input.charCodeAt(peg$currPos) === 62) {
               s1 = peg$c97;
-              peg$currPos += 2;
+              peg$currPos++;
             } else {
               s1 = peg$FAILED;
               if (peg$silentFails === 0) { peg$fail(peg$e104); }
@@ -3877,9 +3876,9 @@ function peg$parse(input, options) {
             s0 = s1;
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
-              if (input.charCodeAt(peg$currPos) === 60) {
+              if (input.substr(peg$currPos, 2) === peg$c98) {
                 s1 = peg$c98;
-                peg$currPos++;
+                peg$currPos += 2;
               } else {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) { peg$fail(peg$e105); }
@@ -3889,6 +3888,21 @@ function peg$parse(input, options) {
                 s1 = peg$f93();
               }
               s0 = s1;
+              if (s0 === peg$FAILED) {
+                s0 = peg$currPos;
+                if (input.charCodeAt(peg$currPos) === 60) {
+                  s1 = peg$c99;
+                  peg$currPos++;
+                } else {
+                  s1 = peg$FAILED;
+                  if (peg$silentFails === 0) { peg$fail(peg$e106); }
+                }
+                if (s1 !== peg$FAILED) {
+                  peg$savedPos = s0;
+                  s1 = peg$f94();
+                }
+                s0 = s1;
+              }
             }
           }
         }
@@ -3904,13 +3918,13 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterOperator() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parseoperator();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f94(s1);
+      s1 = peg$f95(s1);
     }
     s0 = s1;
 
@@ -3918,7 +3932,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsealphanumeric() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -3928,7 +3942,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e107); }
+      if (peg$silentFails === 0) { peg$fail(peg$e108); }
     }
     if (s2 !== peg$FAILED) {
       while (s2 !== peg$FAILED) {
@@ -3938,7 +3952,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e107); }
+          if (peg$silentFails === 0) { peg$fail(peg$e108); }
         }
       }
     } else {
@@ -3946,32 +3960,32 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f95(s1);
+      s1 = peg$f96(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e106); }
+      if (peg$silentFails === 0) { peg$fail(peg$e107); }
     }
 
     return s0;
   }
 
   function peg$parselogicalAnd() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
     peg$savedPos = s0;
-    s1 = peg$f96();
+    s1 = peg$f97();
     s0 = s1;
 
     return s0;
   }
 
   function peg$parse_() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = [];
@@ -3993,18 +4007,16 @@ function peg$parse(input, options) {
       }
     }
     peg$silentFails--;
-    s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e108); }
 
     return s0;
   }
 
   function peg$parsequotedString() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
-    s1 = peg$f97();
+    s1 = peg$f98();
     if (s1) {
       s1 = undefined;
     } else {
@@ -4031,7 +4043,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesimpleQuotedString() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -4093,7 +4105,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e107); }
+          if (peg$silentFails === 0) { peg$fail(peg$e108); }
         }
         while (s6 !== peg$FAILED) {
           s5.push(s6);
@@ -4102,11 +4114,11 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e107); }
+            if (peg$silentFails === 0) { peg$fail(peg$e108); }
           }
         }
         peg$savedPos = s0;
-        s0 = peg$f98(s1, s3, s5);
+        s0 = peg$f99(s1, s3, s5);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4125,7 +4137,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsenestedQuotedString() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -4177,7 +4189,7 @@ function peg$parse(input, options) {
         }
         if (s5 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 8220) {
-            s6 = peg$c99;
+            s6 = peg$c100;
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
@@ -4185,7 +4197,7 @@ function peg$parse(input, options) {
           }
           if (s6 !== peg$FAILED) {
             peg$savedPos = s4;
-            s4 = peg$f99(s1);
+            s4 = peg$f100(s1);
           } else {
             peg$currPos = s4;
             s4 = peg$FAILED;
@@ -4208,7 +4220,7 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8221) {
-              s6 = peg$c100;
+              s6 = peg$c101;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
@@ -4216,7 +4228,7 @@ function peg$parse(input, options) {
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f100(s1);
+              s4 = peg$f101(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -4239,7 +4251,7 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 34) {
-                s6 = peg$c101;
+                s6 = peg$c102;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
@@ -4247,7 +4259,7 @@ function peg$parse(input, options) {
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f101(s1);
+                s4 = peg$f102(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -4282,7 +4294,7 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8220) {
-              s6 = peg$c99;
+              s6 = peg$c100;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
@@ -4290,7 +4302,7 @@ function peg$parse(input, options) {
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f99(s1);
+              s4 = peg$f100(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -4313,7 +4325,7 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 8221) {
-                s6 = peg$c100;
+                s6 = peg$c101;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
@@ -4321,7 +4333,7 @@ function peg$parse(input, options) {
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f100(s1);
+                s4 = peg$f101(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -4344,7 +4356,7 @@ function peg$parse(input, options) {
               }
               if (s5 !== peg$FAILED) {
                 if (input.charCodeAt(peg$currPos) === 34) {
-                  s6 = peg$c101;
+                  s6 = peg$c102;
                   peg$currPos++;
                 } else {
                   s6 = peg$FAILED;
@@ -4352,7 +4364,7 @@ function peg$parse(input, options) {
                 }
                 if (s6 !== peg$FAILED) {
                   peg$savedPos = s4;
-                  s4 = peg$f101(s1);
+                  s4 = peg$f102(s1);
                 } else {
                   peg$currPos = s4;
                   s4 = peg$FAILED;
@@ -4368,7 +4380,7 @@ function peg$parse(input, options) {
       s4 = peg$parseclosingQuote();
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f102(s1, s3, s4);
+        s0 = peg$f103(s1, s3, s4);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4387,7 +4399,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseclosingQuote() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.charAt(peg$currPos);
@@ -4424,7 +4436,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsevalidClosingCondition() {
-    var s0, s1, s2, s3, s4;
+    let s0, s1, s2, s3, s4;
 
     s0 = peg$currPos;
     s1 = [];
@@ -4562,7 +4574,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewordBoundary() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.charAt(peg$currPos);
     if (peg$r13.test(s0)) {
@@ -4715,30 +4727,36 @@ function peg$parse(input, options) {
 
   peg$result = peg$startRuleFunction();
 
-  if (options.peg$library) {
-    return /** @type {any} */ ({
-      peg$result,
-      peg$currPos,
-      peg$FAILED,
-      peg$maxFailExpected,
-      peg$maxFailPos
-    });
-  }
-  if (peg$result !== peg$FAILED && peg$currPos === input.length) {
-    return peg$result;
-  } else {
+  const peg$success = (peg$result !== peg$FAILED && peg$currPos === input.length);
+  function peg$throw() {
     if (peg$result !== peg$FAILED && peg$currPos < input.length) {
       peg$fail(peg$endExpectation());
     }
 
     throw peg$buildStructuredError(
       peg$maxFailExpected,
-      peg$maxFailPos < input.length ? input.charAt(peg$maxFailPos) : null,
+      peg$maxFailPos < input.length ? peg$getUnicode(peg$maxFailPos) : null,
       peg$maxFailPos < input.length
         ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1)
         : peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
     );
   }
+  if (options.peg$library) {
+    return /** @type {any} */ ({
+      peg$result,
+      peg$currPos,
+      peg$FAILED,
+      peg$maxFailExpected,
+      peg$maxFailPos,
+      peg$success,
+      peg$throw: peg$success ? undefined : peg$throw,
+    });
+  }
+  if (peg$success) {
+    return peg$result;
+  } else {
+    peg$throw();
+  }
 }
 
 const peg$allowedStartRules = [
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index 75d2f61423d8..52d485bebc19 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -713,7 +713,11 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
             ) {
                 const keyInCorrectForm = (Object.keys(CONST.SEARCH.SYNTAX_FILTER_KEYS) as FilterKeys[]).find((key) => CONST.SEARCH.SYNTAX_FILTER_KEYS[key] === filterKey);
                 if (keyInCorrectForm) {
-                    return `${prefix}${CONST.SEARCH.SYNTAX_FILTER_KEYS[keyInCorrectForm]}:${sanitizeSearchValue(filterValue as string)}`;
+                    const operator =
+                        filterKey === FILTER_KEYS.MERCHANT
+                            ? operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS]
+                            : operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO];
+                    return `${prefix}${CONST.SEARCH.SYNTAX_FILTER_KEYS[keyInCorrectForm]}${operator}${sanitizeSearchValue(filterValue as string)}`;
                 }
             }
             if ((filterKey === FILTER_KEYS.REPORT_ID || filterKey === FILTER_KEYS.WITHDRAWAL_ID) && filterValue) {
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index 7aac5ba59619..adc8cd651b8c 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -180,7 +180,7 @@ describe('SearchQueryUtils', () => {
 
             const result = buildQueryStringFromFilterFormValues(filterValues);
 
-            expect(result).toEqual('sortBy:date sortOrder:desc type:expense policyID:67890 merchant:Amazon description:Electronics laptop category:electronics,gadgets');
+            expect(result).toEqual('sortBy:date sortOrder:desc type:expense policyID:67890 merchant*:Amazon description:Electronics laptop category:electronics,gadgets');
         });
 
         test('currencies and categories', () => {
@@ -323,7 +323,7 @@ describe('SearchQueryUtils', () => {
 
                 const result = buildQueryStringFromFilterFormValues(filterValues, {sortBy: 'amount', sortOrder: 'asc', limit: 25});
 
-                expect(result).toEqual('sortBy:amount sortOrder:asc type:expense merchant:Amazon limit:25');
+                expect(result).toEqual('sortBy:amount sortOrder:asc type:expense merchant*:Amazon limit:25');
             });
 
             test('omits limit when not provided', () => {

From 167132a0739222b199831bf52bf96bb7df34ff16 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Tue, 10 Mar 2026 18:16:00 +0700
Subject: [PATCH 02/38] fix: Use contains operator for merchant filter in
 advanced search

Switch merchant filter from : (eq) to *: (contains) operator to preserve
partial-matching UX when backend starts respecting eq vs contains distinction.

- Add *: operator support to parser grammar
- Update buildQueryStringFromFilterFormValues to use *: for merchant
- Update unit test expectations

Fixes https://github.com/Expensify/App/issues/80823
---
 src/libs/SearchParser/autocompleteParser.js | 3270 ++++++-------------
 src/libs/SearchParser/baseRules.peggy       |    5 +-
 src/libs/SearchParser/searchParser.js       | 1706 +++++-----
 src/libs/SearchQueryUtils.ts                |    9 +-
 tests/unit/Search/SearchQueryUtilsTest.ts   |    4 +-
 5 files changed, 1831 insertions(+), 3163 deletions(-)

diff --git a/src/libs/SearchParser/autocompleteParser.js b/src/libs/SearchParser/autocompleteParser.js
index e70056f0d519..8bbd481fb0ab 100644
--- a/src/libs/SearchParser/autocompleteParser.js
+++ b/src/libs/SearchParser/autocompleteParser.js
@@ -1,7 +1,6 @@
 'worklet'
 
-class peg$SyntaxError{}
-// @generated by Peggy 4.0.3.
+// @generated by Peggy 5.0.6.
 //
 // https://peggyjs.org/
 
@@ -11,598 +10,494 @@ class peg$SyntaxError{}
 // To make changes, edit the corresponding *.peggy files only.
 // Use the `generate-search-parser` and `generate-autocomplete-parser` scripts to regenerate parsers after modifications.
 
-function peg$subclass(child, parent) {
-  function C() { this.constructor = child; }
-  C.prototype = parent.prototype;
-  child.prototype = new C();
-}
-
-function temporary(message, expected, found, location) {
-  var self = Error.call(this, message);
-  // istanbul ignore next Check is a necessary evil to support older environments
-  if (Object.setPrototypeOf) {
-    Object.setPrototypeOf(self, peg$SyntaxError.prototype);
-  }
-  self.expected = expected;
-  self.found = found;
-  self.location = location;
-  self.name = "SyntaxError";
-  return self;
-}
-
-
-
-function peg$padEnd(str, targetLength, padString) {
-  padString = padString || " ";
-  if (str.length > targetLength) { return str; }
-  targetLength -= str.length;
-  padString += padString.repeat(targetLength);
-  return str + padString.slice(0, targetLength);
-}
+class peg$SyntaxError extends SyntaxError {
+  constructor(message, expected, found, location) {
+    super(message);
+    this.expected = expected;
+    this.found = found;
+    this.location = location;
+    this.name = "SyntaxError";
+  }
+
+  format(sources) {
+    let str = "Error: " + this.message;
+    if (this.location) {
+      let src = null;
+      const st = sources.find(s => s.source === this.location.source);
+      if (st) {
+        src = st.text.split(/\r\n|\n|\r/g);
+      }
+      const s = this.location.start;
+      const offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
+        ? this.location.source.offset(s)
+        : s;
+      const loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
+      if (src) {
+        const e = this.location.end;
+        const filler = "".padEnd(offset_s.line.toString().length, " ");
+        const line = src[s.line - 1];
+        const last = s.line === e.line ? e.column : line.length + 1;
+        const hatLen = (last - s.column) || 1;
+        str += "\n --> " + loc + "\n"
+            + filler + " |\n"
+            + offset_s.line + " | " + line + "\n"
+            + filler + " | " + "".padEnd(s.column - 1, " ")
+            + "".padEnd(hatLen, "^");
+      } else {
+        str += "\n at " + loc;
+      }
+    }
+    return str;
+  }
+
+  static buildMessage(expected, found) {
+    function hex(ch) {
+      return ch.codePointAt(0).toString(16).toUpperCase();
+    }
+
+    const nonPrintable = Object.prototype.hasOwnProperty.call(RegExp.prototype, "unicode")
+      ? new RegExp("[\\p{C}\\p{Mn}\\p{Mc}]", "gu")
+      : null;
+    function unicodeEscape(s) {
+      if (nonPrintable) {
+        return s.replace(nonPrintable,  ch => "\\u{" + hex(ch) + "}");
+      }
+      return s;
+    }
+
+    function literalEscape(s) {
+      return unicodeEscape(s
+        .replace(/\\/g, "\\\\")
+        .replace(/"/g,  "\\\"")
+        .replace(/\0/g, "\\0")
+        .replace(/\t/g, "\\t")
+        .replace(/\n/g, "\\n")
+        .replace(/\r/g, "\\r")
+        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
+        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
+    }
+
+    function classEscape(s) {
+      return unicodeEscape(s
+        .replace(/\\/g, "\\\\")
+        .replace(/\]/g, "\\]")
+        .replace(/\^/g, "\\^")
+        .replace(/-/g,  "\\-")
+        .replace(/\0/g, "\\0")
+        .replace(/\t/g, "\\t")
+        .replace(/\n/g, "\\n")
+        .replace(/\r/g, "\\r")
+        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
+        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
+    }
+
+    const DESCRIBE_EXPECTATION_FNS = {
+      literal(expectation) {
+        return "\"" + literalEscape(expectation.text) + "\"";
+      },
 
-peg$SyntaxError.prototype.format = function(sources) {
-  var str = "Error: " + this.message;
-  if (this.location) {
-    var src = null;
-    var k;
-    for (k = 0; k < sources.length; k++) {
-      if (sources[k].source === this.location.source) {
-        src = sources[k].text.split(/\r\n|\n|\r/g);
-        break;
-      }
-    }
-    var s = this.location.start;
-    var offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
-      ? this.location.source.offset(s)
-      : s;
-    var loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
-    if (src) {
-      var e = this.location.end;
-      var filler = peg$padEnd("", offset_s.line.toString().length, ' ');
-      var line = src[s.line - 1];
-      var last = s.line === e.line ? e.column : line.length + 1;
-      var hatLen = (last - s.column) || 1;
-      str += "\n --> " + loc + "\n"
-          + filler + " |\n"
-          + offset_s.line + " | " + line + "\n"
-          + filler + " | " + peg$padEnd("", s.column - 1, ' ')
-          + peg$padEnd("", hatLen, "^");
-    } else {
-      str += "\n at " + loc;
-    }
-  }
-  return str;
-};
+      class(expectation) {
+        const escapedParts = expectation.parts.map(
+          part => (Array.isArray(part)
+            ? classEscape(part[0]) + "-" + classEscape(part[1])
+            : classEscape(part))
+        );
 
-peg$SyntaxError.buildMessage = function(expected, found) {
-  var DESCRIBE_EXPECTATION_FNS = {
-    literal: function(expectation) {
-      return "\"" + literalEscape(expectation.text) + "\"";
-    },
-
-    class: function(expectation) {
-      var escapedParts = expectation.parts.map(function(part) {
-        return Array.isArray(part)
-          ? classEscape(part[0]) + "-" + classEscape(part[1])
-          : classEscape(part);
-      });
+        return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]" + (expectation.unicode ? "u" : "");
+      },
 
-      return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]";
-    },
+      any() {
+        return "any character";
+      },
 
-    any: function() {
-      return "any character";
-    },
+      end() {
+        return "end of input";
+      },
 
-    end: function() {
-      return "end of input";
-    },
+      other(expectation) {
+        return expectation.description;
+      },
+    };
 
-    other: function(expectation) {
-      return expectation.description;
+    function describeExpectation(expectation) {
+      return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
     }
-  };
-
-  function hex(ch) {
-    return ch.charCodeAt(0).toString(16).toUpperCase();
-  }
 
-  function literalEscape(s) {
-    return s
-      .replace(/\\/g, "\\\\")
-      .replace(/"/g,  "\\\"")
-      .replace(/\0/g, "\\0")
-      .replace(/\t/g, "\\t")
-      .replace(/\n/g, "\\n")
-      .replace(/\r/g, "\\r")
-      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
-      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
-  }
-
-  function classEscape(s) {
-    return s
-      .replace(/\\/g, "\\\\")
-      .replace(/\]/g, "\\]")
-      .replace(/\^/g, "\\^")
-      .replace(/-/g,  "\\-")
-      .replace(/\0/g, "\\0")
-      .replace(/\t/g, "\\t")
-      .replace(/\n/g, "\\n")
-      .replace(/\r/g, "\\r")
-      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
-      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
-  }
+    function describeExpected(expected) {
+      const descriptions = expected.map(describeExpectation);
+      descriptions.sort();
 
-  function describeExpectation(expectation) {
-    return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
-  }
+      if (descriptions.length > 0) {
+        let j = 1;
+        for (let i = 1; i < descriptions.length; i++) {
+          if (descriptions[i - 1] !== descriptions[i]) {
+            descriptions[j] = descriptions[i];
+            j++;
+          }
+        }
+        descriptions.length = j;
+      }
 
-  function describeExpected(expected) {
-    var descriptions = expected.map(describeExpectation);
-    var i, j;
+      switch (descriptions.length) {
+        case 1:
+          return descriptions[0];
 
-    descriptions.sort();
+        case 2:
+          return descriptions[0] + " or " + descriptions[1];
 
-    if (descriptions.length > 0) {
-      for (i = 1, j = 1; i < descriptions.length; i++) {
-        if (descriptions[i - 1] !== descriptions[i]) {
-          descriptions[j] = descriptions[i];
-          j++;
-        }
+        default:
+          return descriptions.slice(0, -1).join(", ")
+            + ", or "
+            + descriptions[descriptions.length - 1];
       }
-      descriptions.length = j;
     }
 
-    switch (descriptions.length) {
-      case 1:
-        return descriptions[0];
-
-      case 2:
-        return descriptions[0] + " or " + descriptions[1];
-
-      default:
-        return descriptions.slice(0, -1).join(", ")
-          + ", or "
-          + descriptions[descriptions.length - 1];
+    function describeFound(found) {
+      return found ? "\"" + literalEscape(found) + "\"" : "end of input";
     }
-  }
 
-  function describeFound(found) {
-    return found ? "\"" + literalEscape(found) + "\"" : "end of input";
+    return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
   }
-
-  return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
-};
+}
 
 function peg$parse(input, options) {
   options = options !== undefined ? options : {};
 
-  var peg$FAILED = {};
-  var peg$source = options.grammarSource;
-
-  var peg$startRuleFunctions = { query: peg$parsequery };
-  var peg$startRuleFunction = peg$parsequery;
-
-  var peg$c0 = "-";
-  var peg$c1 = "report-field";
-  var peg$c2 = "reportfield";
-  var peg$c3 = ",";
-  var peg$c4 = "date";
-  var peg$c5 = "amount";
-  var peg$c6 = "merchant";
-  var peg$c7 = "description";
-  var peg$c8 = "reportid";
-  var peg$c9 = "report-id";
-  var peg$c10 = "keyword";
-  var peg$c11 = "in";
-  var peg$c12 = "currency";
-  var peg$c13 = "groupCurrency";
-  var peg$c14 = "group-currency";
-  var peg$c15 = "tag";
-  var peg$c16 = "category";
-  var peg$c17 = "to";
-  var peg$c18 = "exporter";
-  var peg$c19 = "payer";
-  var peg$c20 = "taxrate";
-  var peg$c21 = "tax-rate";
-  var peg$c22 = "cardID";
-  var peg$c23 = "card";
-  var peg$c24 = "from";
-  var peg$c25 = "attendee";
-  var peg$c26 = "expenseType";
-  var peg$c27 = "expense-type";
-  var peg$c28 = "withdrawalType";
-  var peg$c29 = "withdrawal-type";
-  var peg$c30 = "withdrawalid";
-  var peg$c31 = "withdrawal-id";
-  var peg$c32 = "billable";
-  var peg$c33 = "reimbursable";
-  var peg$c34 = "type";
-  var peg$c35 = "status";
-  var peg$c36 = "sortBy";
-  var peg$c37 = "sort-by";
-  var peg$c38 = "sortOrder";
-  var peg$c39 = "sort-order";
-  var peg$c40 = "policyID";
-  var peg$c41 = "workspace";
-  var peg$c42 = "submitted";
-  var peg$c43 = "approved";
-  var peg$c44 = "paid";
-  var peg$c45 = "exported";
-  var peg$c46 = "posted";
-  var peg$c47 = "withdrawn";
-  var peg$c48 = "groupby";
-  var peg$c49 = "group-by";
-  var peg$c50 = "limit";
-  var peg$c51 = "feed";
-  var peg$c52 = "title";
-  var peg$c53 = "assignee";
-  var peg$c54 = "createdby";
-  var peg$c55 = "created-by";
-  var peg$c56 = "action";
-  var peg$c57 = "total";
-  var peg$c58 = "has";
-  var peg$c59 = "is";
-  var peg$c60 = "purchaseamount";
-  var peg$c61 = "purchase-amount";
-  var peg$c62 = "purchasecurrency";
-  var peg$c63 = "purchase-currency";
-  var peg$c64 = "columns";
-  var peg$c65 = "view";
-  var peg$c66 = "per-diem";
-  var peg$c67 = "drafts";
-  var peg$c68 = "draft";
-  var peg$c69 = "original-amount";
-  var peg$c70 = "tax";
-  var peg$c71 = "policy-name";
-  var peg$c72 = "bank-account";
-  var peg$c73 = "long-report-id";
-  var peg$c74 = "exported-to";
-  var peg$c75 = "exportedto";
-  var peg$c76 = "exchange-rate";
-  var peg$c77 = "reimbursable-total";
-  var peg$c78 = "non-reimbursable-total";
-  var peg$c79 = "group-from";
-  var peg$c80 = "group-expenses";
-  var peg$c81 = "group-total";
-  var peg$c82 = "group-card";
-  var peg$c83 = "group-feed";
-  var peg$c84 = "group-bank-account";
-  var peg$c85 = "group-withdrawn";
-  var peg$c86 = "group-withdrawal-id";
-  var peg$c87 = "group-category";
-  var peg$c88 = "group-tag";
-  var peg$c89 = "group-merchant";
-  var peg$c90 = "group-month";
-  var peg$c91 = "group-week";
-  var peg$c92 = "group-year";
-  var peg$c93 = "group-quarter";
-  var peg$c94 = "!=";
-  var peg$c95 = ">=";
-  var peg$c96 = ">";
-  var peg$c97 = "<=";
-  var peg$c98 = "<";
-  var peg$c99 = "\u201C";
-  var peg$c100 = "\u201D";
-  var peg$c101 = "\"";
-
-  var peg$r0 = /^[ \t\r\n\xA0,:=<>!]/;
-  var peg$r1 = /^[:=]/;
-  var peg$r2 = /^[^ ,\t\n\r\xA0]/;
-  var peg$r3 = /^[ \t\r\n\xA0]/;
-  var peg$r4 = /^[^ ,"\u201D\u201C\t\n\r\xA0]/;
-  var peg$r5 = /^["\u201C-\u201D]/;
-  var peg$r6 = /^[^"\u201D\u201C\r\n]/;
-  var peg$r7 = /^[ \t\n\r\xA0a-zA-Z0-9]/;
-  var peg$r8 = /^[a-zA-Z0-9]/;
-  var peg$r9 = /^[ \t\n\r\xA0]/;
-  var peg$r10 = /^[ \t\n\r\xA0a-zA-Z]/;
-  var peg$r11 = /^[,]/;
-  var peg$r12 = /^[ \t\n\r\xA0,]/;
-
-  var peg$e0 = peg$literalExpectation("-", false);
-  var peg$e1 = peg$literalExpectation("report-field", true);
-  var peg$e2 = peg$literalExpectation("reportfield", true);
-  var peg$e3 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0", ",", ":", "=", "<", ">", "!"], false, false);
-  var peg$e4 = peg$anyExpectation();
-  var peg$e5 = peg$literalExpectation(",", false);
-  var peg$e6 = peg$otherExpectation("key");
-  var peg$e7 = peg$literalExpectation("date", true);
-  var peg$e8 = peg$literalExpectation("amount", true);
-  var peg$e9 = peg$literalExpectation("merchant", true);
-  var peg$e10 = peg$literalExpectation("description", true);
-  var peg$e11 = peg$literalExpectation("reportid", true);
-  var peg$e12 = peg$literalExpectation("report-id", true);
-  var peg$e13 = peg$literalExpectation("keyword", true);
-  var peg$e14 = peg$literalExpectation("in", true);
-  var peg$e15 = peg$literalExpectation("currency", true);
-  var peg$e16 = peg$literalExpectation("groupCurrency", false);
-  var peg$e17 = peg$literalExpectation("group-currency", true);
-  var peg$e18 = peg$literalExpectation("tag", true);
-  var peg$e19 = peg$literalExpectation("category", true);
-  var peg$e20 = peg$literalExpectation("to", true);
-  var peg$e21 = peg$literalExpectation("exporter", true);
-  var peg$e22 = peg$literalExpectation("payer", true);
-  var peg$e23 = peg$literalExpectation("taxRate", true);
-  var peg$e24 = peg$literalExpectation("tax-rate", true);
-  var peg$e25 = peg$literalExpectation("cardID", false);
-  var peg$e26 = peg$literalExpectation("card", true);
-  var peg$e27 = peg$literalExpectation("from", true);
-  var peg$e28 = peg$literalExpectation("attendee", true);
-  var peg$e29 = peg$literalExpectation("expenseType", false);
-  var peg$e30 = peg$literalExpectation("expense-type", true);
-  var peg$e31 = peg$literalExpectation("withdrawalType", false);
-  var peg$e32 = peg$literalExpectation("withdrawal-type", true);
-  var peg$e33 = peg$literalExpectation("withdrawalID", true);
-  var peg$e34 = peg$literalExpectation("withdrawal-id", true);
-  var peg$e35 = peg$literalExpectation("billable", true);
-  var peg$e36 = peg$literalExpectation("reimbursable", true);
-  var peg$e37 = peg$literalExpectation("type", true);
-  var peg$e38 = peg$literalExpectation("status", true);
-  var peg$e39 = peg$literalExpectation("sortBy", false);
-  var peg$e40 = peg$literalExpectation("sort-by", true);
-  var peg$e41 = peg$literalExpectation("sortOrder", false);
-  var peg$e42 = peg$literalExpectation("sort-order", true);
-  var peg$e43 = peg$literalExpectation("policyID", false);
-  var peg$e44 = peg$literalExpectation("workspace", true);
-  var peg$e45 = peg$literalExpectation("submitted", true);
-  var peg$e46 = peg$literalExpectation("approved", true);
-  var peg$e47 = peg$literalExpectation("paid", true);
-  var peg$e48 = peg$literalExpectation("exported", true);
-  var peg$e49 = peg$literalExpectation("posted", true);
-  var peg$e50 = peg$literalExpectation("withdrawn", true);
-  var peg$e51 = peg$literalExpectation("groupBy", true);
-  var peg$e52 = peg$literalExpectation("group-by", true);
-  var peg$e53 = peg$literalExpectation("limit", true);
-  var peg$e54 = peg$literalExpectation("feed", true);
-  var peg$e55 = peg$literalExpectation("title", true);
-  var peg$e56 = peg$literalExpectation("assignee", true);
-  var peg$e57 = peg$literalExpectation("createdBy", true);
-  var peg$e58 = peg$literalExpectation("created-by", true);
-  var peg$e59 = peg$literalExpectation("action", true);
-  var peg$e60 = peg$literalExpectation("total", true);
-  var peg$e61 = peg$literalExpectation("has", true);
-  var peg$e62 = peg$literalExpectation("is", true);
-  var peg$e63 = peg$literalExpectation("purchaseAmount", true);
-  var peg$e64 = peg$literalExpectation("purchase-amount", true);
-  var peg$e65 = peg$literalExpectation("purchaseCurrency", true);
-  var peg$e66 = peg$literalExpectation("purchase-currency", true);
-  var peg$e67 = peg$literalExpectation("columns", true);
-  var peg$e68 = peg$literalExpectation("view", true);
-  var peg$e69 = peg$literalExpectation("per-diem", true);
-  var peg$e70 = peg$literalExpectation("drafts", true);
-  var peg$e71 = peg$literalExpectation("draft", true);
-  var peg$e72 = peg$literalExpectation("original-amount", true);
-  var peg$e73 = peg$literalExpectation("tax", true);
-  var peg$e74 = peg$literalExpectation("policy-name", true);
-  var peg$e75 = peg$literalExpectation("bank-account", true);
-  var peg$e76 = peg$literalExpectation("long-report-id", true);
-  var peg$e77 = peg$literalExpectation("exported-to", true);
-  var peg$e78 = peg$classExpectation([":", "="], false, false);
-  var peg$e79 = peg$literalExpectation("exportedTo", true);
-  var peg$e80 = peg$literalExpectation("exchange-rate", true);
-  var peg$e81 = peg$literalExpectation("reimbursable-total", true);
-  var peg$e82 = peg$literalExpectation("non-reimbursable-total", true);
-  var peg$e83 = peg$literalExpectation("group-from", true);
-  var peg$e84 = peg$literalExpectation("group-expenses", true);
-  var peg$e85 = peg$literalExpectation("group-total", true);
-  var peg$e86 = peg$literalExpectation("group-card", true);
-  var peg$e87 = peg$literalExpectation("group-feed", true);
-  var peg$e88 = peg$literalExpectation("group-bank-account", true);
-  var peg$e89 = peg$literalExpectation("group-withdrawn", true);
-  var peg$e90 = peg$literalExpectation("group-withdrawal-id", true);
-  var peg$e91 = peg$literalExpectation("group-category", true);
-  var peg$e92 = peg$literalExpectation("group-tag", true);
-  var peg$e93 = peg$literalExpectation("group-merchant", true);
-  var peg$e94 = peg$literalExpectation("group-month", true);
-  var peg$e95 = peg$literalExpectation("group-week", true);
-  var peg$e96 = peg$literalExpectation("group-year", true);
-  var peg$e97 = peg$literalExpectation("group-quarter", true);
-  var peg$e98 = peg$otherExpectation("operator");
-  var peg$e99 = peg$literalExpectation("!=", false);
-  var peg$e100 = peg$literalExpectation(">=", false);
-  var peg$e101 = peg$literalExpectation(">", false);
-  var peg$e102 = peg$literalExpectation("<=", false);
-  var peg$e103 = peg$literalExpectation("<", false);
-  var peg$e104 = peg$otherExpectation("word");
-  var peg$e105 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e106 = peg$otherExpectation("whitespace");
-  var peg$e107 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
-  var peg$e108 = peg$otherExpectation("quote");
-  var peg$e109 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e110 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
-  var peg$e111 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
-  var peg$e112 = peg$literalExpectation("\u201C", false);
-  var peg$e113 = peg$literalExpectation("\u201D", false);
-  var peg$e114 = peg$literalExpectation("\"", false);
-  var peg$e115 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e116 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e117 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
-  var peg$e118 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
-  var peg$e119 = peg$classExpectation([","], false, false);
-  var peg$e120 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false);
-
-  var peg$f0 = function(ranges) { return { autocomplete, ranges }; };
-  var peg$f1 = function(filters) { return filters.filter(Boolean).flat(); };
-  var peg$f2 = function(neg, key, op, value) {
-      expectingNestedQuote = false; nameOperator = false; // Reset string parser
-
-      const isNegated = !!neg && !nonNegatableKeys.has(key);
-
-      if (!value) {
-        autocomplete = {
-          key,
-          negated: isNegated,
-          value: "",
-          start: location().end.offset,
-          length: 0,
-        };
-        return;
-      }
+  const peg$FAILED = {};
+  const peg$source = options.grammarSource;
 
+  const peg$startRuleFunctions = {
+    query: peg$parsequery,
+  };
+  let peg$startRuleFunction = peg$parsequery;
+
+  const peg$c0 = "-";
+  const peg$c1 = "report-field";
+  const peg$c2 = "reportfield";
+  const peg$c3 = ",";
+  const peg$c4 = "date";
+  const peg$c5 = "amount";
+  const peg$c6 = "merchant";
+  const peg$c7 = "description";
+  const peg$c8 = "reportid";
+  const peg$c9 = "report-id";
+  const peg$c10 = "in";
+  const peg$c11 = "currency";
+  const peg$c12 = "groupCurrency";
+  const peg$c13 = "group-currency";
+  const peg$c14 = "tag";
+  const peg$c15 = "category";
+  const peg$c16 = "to";
+  const peg$c17 = "exporter";
+  const peg$c18 = "payer";
+  const peg$c19 = "taxrate";
+  const peg$c20 = "tax-rate";
+  const peg$c21 = "cardID";
+  const peg$c22 = "card";
+  const peg$c23 = "from";
+  const peg$c24 = "attendee";
+  const peg$c25 = "expenseType";
+  const peg$c26 = "expense-type";
+  const peg$c27 = "withdrawalType";
+  const peg$c28 = "withdrawal-type";
+  const peg$c29 = "withdrawalid";
+  const peg$c30 = "withdrawal-id";
+  const peg$c31 = "billable";
+  const peg$c32 = "reimbursable";
+  const peg$c33 = "type";
+  const peg$c34 = "status";
+  const peg$c35 = "policyID";
+  const peg$c36 = "workspace";
+  const peg$c37 = "submitted";
+  const peg$c38 = "approved";
+  const peg$c39 = "paid";
+  const peg$c40 = "exported";
+  const peg$c41 = "posted";
+  const peg$c42 = "withdrawn";
+  const peg$c43 = "groupby";
+  const peg$c44 = "group-by";
+  const peg$c45 = "limit";
+  const peg$c46 = "feed";
+  const peg$c47 = "title";
+  const peg$c48 = "assignee";
+  const peg$c49 = "createdby";
+  const peg$c50 = "created-by";
+  const peg$c51 = "action";
+  const peg$c52 = "total";
+  const peg$c53 = "has";
+  const peg$c54 = "is";
+  const peg$c55 = "purchaseamount";
+  const peg$c56 = "purchase-amount";
+  const peg$c57 = "purchasecurrency";
+  const peg$c58 = "purchase-currency";
+  const peg$c59 = "columns";
+  const peg$c60 = "view";
+  const peg$c61 = "exportedto";
+  const peg$c62 = "exported-to";
+  const peg$c63 = "*:";
+  const peg$c64 = "!=";
+  const peg$c65 = ">=";
+  const peg$c66 = ">";
+  const peg$c67 = "<=";
+  const peg$c68 = "<";
+  const peg$c69 = "\u201C";
+  const peg$c70 = "\u201D";
+  const peg$c71 = "\"";
+
+  const peg$r0 = /^[ \t\r\n\xA0,:=<>!]/;
+  const peg$r1 = /^[:=]/;
+  const peg$r2 = /^[^ ,\t\n\r\xA0]/;
+  const peg$r3 = /^[ \t\r\n\xA0]/;
+  const peg$r4 = /^[^ ,"\u201D\u201C\t\n\r\xA0]/;
+  const peg$r5 = /^["\u201C-\u201D]/;
+  const peg$r6 = /^[^"\u201D\u201C\r\n]/;
+  const peg$r7 = /^[ \t\n\r\xA0a-zA-Z0-9]/;
+  const peg$r8 = /^[a-zA-Z0-9]/;
+  const peg$r9 = /^[ \t\n\r\xA0]/;
+  const peg$r10 = /^[ \t\n\r\xA0a-zA-Z]/;
+  const peg$r11 = /^[,]/;
+  const peg$r12 = /^[ \t\n\r\xA0,]/;
+
+  const peg$e0 = peg$literalExpectation("-", false);
+  const peg$e1 = peg$literalExpectation("report-field", true);
+  const peg$e2 = peg$literalExpectation("reportfield", true);
+  const peg$e3 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0", ",", ":", "=", "<", ">", "!"], false, false, false);
+  const peg$e4 = peg$anyExpectation();
+  const peg$e5 = peg$literalExpectation(",", false);
+  const peg$e6 = peg$otherExpectation("key");
+  const peg$e7 = peg$literalExpectation("date", true);
+  const peg$e8 = peg$literalExpectation("amount", true);
+  const peg$e9 = peg$literalExpectation("merchant", true);
+  const peg$e10 = peg$literalExpectation("description", true);
+  const peg$e11 = peg$literalExpectation("reportid", true);
+  const peg$e12 = peg$literalExpectation("report-id", true);
+  const peg$e13 = peg$literalExpectation("in", true);
+  const peg$e14 = peg$literalExpectation("currency", true);
+  const peg$e15 = peg$literalExpectation("groupCurrency", false);
+  const peg$e16 = peg$literalExpectation("group-currency", true);
+  const peg$e17 = peg$literalExpectation("tag", true);
+  const peg$e18 = peg$literalExpectation("category", true);
+  const peg$e19 = peg$literalExpectation("to", true);
+  const peg$e20 = peg$literalExpectation("exporter", true);
+  const peg$e21 = peg$literalExpectation("payer", true);
+  const peg$e22 = peg$literalExpectation("taxRate", true);
+  const peg$e23 = peg$literalExpectation("tax-rate", true);
+  const peg$e24 = peg$literalExpectation("cardID", false);
+  const peg$e25 = peg$literalExpectation("card", true);
+  const peg$e26 = peg$literalExpectation("from", true);
+  const peg$e27 = peg$literalExpectation("attendee", true);
+  const peg$e28 = peg$literalExpectation("expenseType", false);
+  const peg$e29 = peg$literalExpectation("expense-type", true);
+  const peg$e30 = peg$literalExpectation("withdrawalType", false);
+  const peg$e31 = peg$literalExpectation("withdrawal-type", true);
+  const peg$e32 = peg$literalExpectation("withdrawalID", true);
+  const peg$e33 = peg$literalExpectation("withdrawal-id", true);
+  const peg$e34 = peg$literalExpectation("billable", true);
+  const peg$e35 = peg$literalExpectation("reimbursable", true);
+  const peg$e36 = peg$literalExpectation("type", true);
+  const peg$e37 = peg$literalExpectation("status", true);
+  const peg$e38 = peg$literalExpectation("policyID", false);
+  const peg$e39 = peg$literalExpectation("workspace", true);
+  const peg$e40 = peg$literalExpectation("submitted", true);
+  const peg$e41 = peg$literalExpectation("approved", true);
+  const peg$e42 = peg$literalExpectation("paid", true);
+  const peg$e43 = peg$literalExpectation("exported", true);
+  const peg$e44 = peg$literalExpectation("posted", true);
+  const peg$e45 = peg$literalExpectation("withdrawn", true);
+  const peg$e46 = peg$literalExpectation("groupBy", true);
+  const peg$e47 = peg$literalExpectation("group-by", true);
+  const peg$e48 = peg$literalExpectation("limit", true);
+  const peg$e49 = peg$literalExpectation("feed", true);
+  const peg$e50 = peg$literalExpectation("title", true);
+  const peg$e51 = peg$literalExpectation("assignee", true);
+  const peg$e52 = peg$literalExpectation("createdBy", true);
+  const peg$e53 = peg$literalExpectation("created-by", true);
+  const peg$e54 = peg$literalExpectation("action", true);
+  const peg$e55 = peg$literalExpectation("total", true);
+  const peg$e56 = peg$literalExpectation("has", true);
+  const peg$e57 = peg$literalExpectation("is", true);
+  const peg$e58 = peg$literalExpectation("purchaseAmount", true);
+  const peg$e59 = peg$literalExpectation("purchase-amount", true);
+  const peg$e60 = peg$literalExpectation("purchaseCurrency", true);
+  const peg$e61 = peg$literalExpectation("purchase-currency", true);
+  const peg$e62 = peg$literalExpectation("columns", true);
+  const peg$e63 = peg$literalExpectation("view", true);
+  const peg$e64 = peg$classExpectation([":", "="], false, false, false);
+  const peg$e65 = peg$literalExpectation("exportedTo", true);
+  const peg$e66 = peg$literalExpectation("exported-to", true);
+  const peg$e67 = peg$otherExpectation("operator");
+  const peg$e68 = peg$literalExpectation("*:", false);
+  const peg$e69 = peg$literalExpectation("!=", false);
+  const peg$e70 = peg$literalExpectation(">=", false);
+  const peg$e71 = peg$literalExpectation(">", false);
+  const peg$e72 = peg$literalExpectation("<=", false);
+  const peg$e73 = peg$literalExpectation("<", false);
+  const peg$e74 = peg$otherExpectation("word");
+  const peg$e75 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false, false);
+  const peg$e76 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false, false);
+  const peg$e77 = peg$otherExpectation("quote");
+  const peg$e78 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false, false);
+  const peg$e79 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false, false);
+  const peg$e80 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false, false);
+  const peg$e81 = peg$literalExpectation("\u201C", false);
+  const peg$e82 = peg$literalExpectation("\u201D", false);
+  const peg$e83 = peg$literalExpectation("\"", false);
+  const peg$e84 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false, false);
+  const peg$e85 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false, false);
+  const peg$e86 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false, false);
+  const peg$e87 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false, false);
+  const peg$e88 = peg$classExpectation([","], false, false, false);
+  const peg$e89 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false, false);
+
+  function peg$f0(ranges) {    return { autocomplete, ranges };  }
+  function peg$f1(filters) {    return filters.filter(Boolean).flat();  }
+  function peg$f2(neg, key, op, value) {
+    expectingNestedQuote = false; nameOperator = false; // Reset string parser
+
+    const isNegated = !!neg && !nonNegatableKeys.has(key);
+
+    if (!value) {
       autocomplete = {
         key,
         negated: isNegated,
-        ...value[value.length - 1],
+        value: "",
+        start: location().end.offset,
+        length: 0,
       };
-      return value
-        .filter((v) => v.length > 0)
-        .map((v) => ({
-          key,
-          negated: isNegated,
-          ...v,
-        }));
-    };
-  var peg$f3 = function(rest) {
-      const suffix = rest.replaceAll(/^-+/g, "");
-      return "reportField-" + (suffix ? suffix : "");
-    };
-  var peg$f4 = function() { autocomplete = null; };
-  var peg$f5 = function(k) {
-      nameOperator = (k === "from" || k === "to" || k === "payer" || k === "exporter" || k === "attendee" || k === "createdBy" || k === "assignee");
-      return k;
+      return;
+    }
+
+    autocomplete = {
+      key,
+      negated: isNegated,
+      ...value[value.length - 1],
     };
-  var peg$f6 = function(parts, empty) {
-      const ends = location();
-      const value = parts.flat().filter(Boolean); // Filter out undefined values returned by the predicate
-      if (empty) {
-        value.push("");
-      }
-      let count = ends.start.offset;
-      const result = [];
-      value.forEach((filter) => {
-        let word = filter;
-        if (word.startsWith('"') && word.endsWith('"') && word.length >= 2) {
-          word = word.slice(1, -1);
-        }
-        result.push({
-          value: word,
-          start: count,
-          length: filter.length,
-        });
-        count += filter.length + 1;
+    return value
+      .filter((v) => v.length > 0)
+      .map((v) => ({
+        key,
+        negated: isNegated,
+        ...v,
+      }));
+  }
+  function peg$f3(rest) {
+    const suffix = rest.replaceAll(/^-+/g, "");
+    return "reportField-" + (suffix ? suffix : "");
+  }
+  function peg$f4() {    autocomplete = null;  }
+  function peg$f5(k) {
+    nameOperator = (k === "from" || k === "to" || k === "payer" || k === "exporter" || k === "attendee" || k === "createdBy" || k === "assignee");
+    return k;
+  }
+  function peg$f6(parts, empty) {
+    const ends = location();
+    const value = parts.flat().filter(Boolean); // Filter out undefined values returned by the predicate
+    if (empty) {
+      value.push("");
+    }
+    let count = ends.start.offset;
+    const result = [];
+    value.forEach((filter) => {
+      let word = filter;
+      if (word.startsWith('"') && word.endsWith('"') && word.length >= 2) {
+        word = word.slice(1, -1);
+      }
+      result.push({
+        value: word,
+        start: count,
+        length: filter.length,
       });
-      return result;
-    };
-  var peg$f7 = function() { return "date"; };
-  var peg$f8 = function() { return "amount"; };
-  var peg$f9 = function() { return "merchant"; };
-  var peg$f10 = function() { return "description"; };
-  var peg$f11 = function() { return "reportID"; };
-  var peg$f12 = function() { return "keyword"; };
-  var peg$f13 = function() { return "in"; };
-  var peg$f14 = function() { return "currency"; };
-  var peg$f15 = function() { return "groupCurrency"; };
-  var peg$f16 = function() { return "tag"; };
-  var peg$f17 = function() { return "category"; };
-  var peg$f18 = function() { return "to"; };
-  var peg$f19 = function() { return "exporter"; };
-  var peg$f20 = function() { return "payer"; };
-  var peg$f21 = function() { return "taxRate"; };
-  var peg$f22 = function() { return "cardID"; };
-  var peg$f23 = function() { return "from"; };
-  var peg$f24 = function() {return "attendee"};
-  var peg$f25 = function() { return "expenseType"; };
-  var peg$f26 = function() { return "withdrawalType"; };
-  var peg$f27 = function() { return "withdrawalID"; };
-  var peg$f28 = function() { return "billable"; };
-  var peg$f29 = function() { return "reimbursable"; };
-  var peg$f30 = function() { return "type"; };
-  var peg$f31 = function() { return "status"; };
-  var peg$f32 = function() { return "sortBy"; };
-  var peg$f33 = function() { return "sortOrder"; };
-  var peg$f34 = function() { return "policyID"; };
-  var peg$f35 = function() { return "submitted"; };
-  var peg$f36 = function() { return "approved"; };
-  var peg$f37 = function() { return "paid"; };
-  var peg$f38 = function() { return "exported"; };
-  var peg$f39 = function() { return "posted"; };
-  var peg$f40 = function() { return "withdrawn"; };
-  var peg$f41 = function() { return "groupBy"; };
-  var peg$f42 = function() { return "limit"; };
-  var peg$f43 = function() { return "feed"; };
-  var peg$f44 = function() { return "title"; };
-  var peg$f45 = function() { return "assignee"; };
-  var peg$f46 = function() { return "createdBy"; };
-  var peg$f47 = function() { return "action"; };
-  var peg$f48 = function() {return "total"; };
-  var peg$f49 = function() {return "has"; };
-  var peg$f50 = function() {return "is"; };
-  var peg$f51 = function() {return "purchaseAmount"};
-  var peg$f52 = function() {return "purchaseCurrency"};
-  var peg$f53 = function() {
-  isColumnsContext = true;
-  return "columns";
-};
-  var peg$f54 = function() {return "view"};
-  var peg$f55 = function() { return isColumnsContext; };
-  var peg$f56 = function() { return "perDiem"; };
-  var peg$f57 = function() { return "drafts"; };
-  var peg$f58 = function() { return "originalamount"; };
-  var peg$f59 = function() { return "taxAmount"; };
-  var peg$f60 = function() { return "taxrate"; };
-  var peg$f61 = function() { return "policyname"; };
-  var peg$f62 = function() { return "withdrawalID"; };
-  var peg$f63 = function() { return "bankAccount"; };
-  var peg$f64 = function() { return "reportID"; };
-  var peg$f65 = function() { return "base62ReportID"; };
-  var peg$f66 = function() { return "exportedto"; };
-  var peg$f67 = function() { return "exportedTo"; };
-  var peg$f68 = function() { return "exportedTo"; };
-  var peg$f69 = function() { return "exchangeRate"; };
-  var peg$f70 = function() { return "reimbursableTotal"; };
-  var peg$f71 = function() { return "nonReimbursableTotal"; };
-  var peg$f72 = function() { return "groupFrom"; };
-  var peg$f73 = function() { return "groupExpenses"; };
-  var peg$f74 = function() { return "groupTotal"; };
-  var peg$f75 = function() { return "groupCard"; };
-  var peg$f76 = function() { return "groupFeed"; };
-  var peg$f77 = function() { return "groupBankAccount"; };
-  var peg$f78 = function() { return "groupWithdrawn"; };
-  var peg$f79 = function() { return "groupWithdrawalID"; };
-  var peg$f80 = function() { return "groupCategory"; };
-  var peg$f81 = function() { return "groupTag"; };
-  var peg$f82 = function() { return "groupMerchant"; };
-  var peg$f83 = function() { return "groupmonth"; };
-  var peg$f84 = function() { return "groupweek"; };
-  var peg$f85 = function() { return "groupyear"; };
-  var peg$f86 = function() { return "groupquarter"; };
-  var peg$f87 = function() { return "eq"; };
-  var peg$f88 = function() { return "neq"; };
-  var peg$f89 = function() { return "gte"; };
-  var peg$f90 = function() { return "gt"; };
-  var peg$f91 = function() { return "lte"; };
-  var peg$f92 = function() { return "lt"; };
-  var peg$f93 = function(o) {
-      if (nameOperator) {
-        expectingNestedQuote = (o === "eq"); // Use simple parser if no valid operator is found
-      }
-      isColumnsContext = false;
-      return o;
-  };
-  var peg$f94 = function(chars) { return chars.join("").trim(); };
-  var peg$f95 = function() { 
-  isColumnsContext = false;
-  return "and";
-};
-  var peg$f96 = function() { return expectingNestedQuote; };
-  var peg$f97 = function(start, inner, end) { //handle no-breaking space
-      return [...start, '"', ...inner, '"', ...end].join("");
-    };
-  var peg$f98 = function(start) {return "“"};
-  var peg$f99 = function(start) {return "”"};
-  var peg$f100 = function(start) {return "\""};
-  var peg$f101 = function(start, inner, end) {
+      count += filter.length + 1;
+    });
+    return result;
+  }
+  function peg$f7() {    return "date";  }
+  function peg$f8() {    return "amount";  }
+  function peg$f9() {    return "merchant";  }
+  function peg$f10() {    return "description";  }
+  function peg$f11() {    return "reportID";  }
+  function peg$f12() {    return "in";  }
+  function peg$f13() {    return "currency";  }
+  function peg$f14() {    return "groupCurrency";  }
+  function peg$f15() {    return "tag";  }
+  function peg$f16() {    return "category";  }
+  function peg$f17() {    return "to";  }
+  function peg$f18() {    return "exporter";  }
+  function peg$f19() {    return "payer";  }
+  function peg$f20() {    return "taxRate";  }
+  function peg$f21() {    return "cardID";  }
+  function peg$f22() {    return "from";  }
+  function peg$f23() {return "attendee"  }
+  function peg$f24() {    return "expenseType";  }
+  function peg$f25() {    return "withdrawalType";  }
+  function peg$f26() {    return "withdrawalID";  }
+  function peg$f27() {    return "billable";  }
+  function peg$f28() {    return "reimbursable";  }
+  function peg$f29() {    return "type";  }
+  function peg$f30() {    return "status";  }
+  function peg$f31() {    return "policyID";  }
+  function peg$f32() {    return "submitted";  }
+  function peg$f33() {    return "approved";  }
+  function peg$f34() {    return "paid";  }
+  function peg$f35() {    return "exported";  }
+  function peg$f36() {    return "posted";  }
+  function peg$f37() {    return "withdrawn";  }
+  function peg$f38() {    return "groupBy";  }
+  function peg$f39() {    return "limit";  }
+  function peg$f40() {    return "feed";  }
+  function peg$f41() {    return "title";  }
+  function peg$f42() {    return "assignee";  }
+  function peg$f43() {    return "createdBy";  }
+  function peg$f44() {    return "action";  }
+  function peg$f45() {return "total";  }
+  function peg$f46() {return "has";  }
+  function peg$f47() {return "is";  }
+  function peg$f48() {return "purchaseAmount"  }
+  function peg$f49() {return "purchaseCurrency"  }
+  function peg$f50() {
+    isColumnsContext = true;
+    return "columns";
+  }
+  function peg$f51() {return "view"  }
+  function peg$f52() {    return "exportedTo";  }
+  function peg$f53() {    return "exportedTo";  }
+  function peg$f54() {    return "contains";  }
+  function peg$f55() {    return "eq";  }
+  function peg$f56() {    return "neq";  }
+  function peg$f57() {    return "gte";  }
+  function peg$f58() {    return "gt";  }
+  function peg$f59() {    return "lte";  }
+  function peg$f60() {    return "lt";  }
+  function peg$f61(o) {
+    if (nameOperator) {
+      expectingNestedQuote = (o === "eq" || o === "contains");
+    }
+    isColumnsContext = false;
+    return o;
+  }
+  function peg$f62(chars) {    return chars.join("").trim();  }
+  function peg$f63() {    
+     isColumnsContext = false;
+     return "and";
+  }
+  function peg$f64() {    return expectingNestedQuote;  }
+  function peg$f65(start, inner, end) {    //handle no-breaking space
+         return [...start, '"', ...inner, '"', ...end].join("");
+  }
+  function peg$f66(start) {return "“"  }
+  function peg$f67(start) {return "”"  }
+  function peg$f68(start) {return "\""  }
+  function peg$f69(start, inner, end) {
     return [...start, '"', ...inner, '"'].join("");
-};
-  var peg$currPos = options.peg$currPos | 0;
-  var peg$savedPos = peg$currPos;
-  var peg$posDetailsCache = [{ line: 1, column: 1 }];
-  var peg$maxFailPos = peg$currPos;
-  var peg$maxFailExpected = options.peg$maxFailExpected || [];
-  var peg$silentFails = options.peg$silentFails | 0;
+  }
+  let peg$currPos = options.peg$currPos | 0;
+  let peg$savedPos = peg$currPos;
+  const peg$posDetailsCache = [{ line: 1, column: 1 }];
+  let peg$maxFailPos = peg$currPos;
+  let peg$maxFailExpected = options.peg$maxFailExpected || [];
+  let peg$silentFails = options.peg$silentFails | 0;
 
-  var peg$result;
+  let peg$result;
 
   if (options.startRule) {
     if (!(options.startRule in peg$startRuleFunctions)) {
@@ -624,7 +519,7 @@ function peg$parse(input, options) {
     return {
       source: peg$source,
       start: peg$savedPos,
-      end: peg$currPos
+      end: peg$currPos,
     };
   }
 
@@ -652,12 +547,20 @@ function peg$parse(input, options) {
     throw peg$buildSimpleError(message, location);
   }
 
+  function peg$getUnicode(pos = peg$currPos) {
+    const cp = input.codePointAt(pos);
+    if (cp === undefined) {
+      return "";
+    }
+    return String.fromCodePoint(cp);
+  }
+
   function peg$literalExpectation(text, ignoreCase) {
-    return { type: "literal", text: text, ignoreCase: ignoreCase };
+    return { type: "literal", text, ignoreCase };
   }
 
-  function peg$classExpectation(parts, inverted, ignoreCase) {
-    return { type: "class", parts: parts, inverted: inverted, ignoreCase: ignoreCase };
+  function peg$classExpectation(parts, inverted, ignoreCase, unicode) {
+    return { type: "class", parts, inverted, ignoreCase, unicode };
   }
 
   function peg$anyExpectation() {
@@ -669,12 +572,12 @@ function peg$parse(input, options) {
   }
 
   function peg$otherExpectation(description) {
-    return { type: "other", description: description };
+    return { type: "other", description };
   }
 
   function peg$computePosDetails(pos) {
-    var details = peg$posDetailsCache[pos];
-    var p;
+    let details = peg$posDetailsCache[pos];
+    let p;
 
     if (details) {
       return details;
@@ -689,7 +592,7 @@ function peg$parse(input, options) {
       details = peg$posDetailsCache[p];
       details = {
         line: details.line,
-        column: details.column
+        column: details.column,
       };
 
       while (p < pos) {
@@ -710,21 +613,21 @@ function peg$parse(input, options) {
   }
 
   function peg$computeLocation(startPos, endPos, offset) {
-    var startPosDetails = peg$computePosDetails(startPos);
-    var endPosDetails = peg$computePosDetails(endPos);
+    const startPosDetails = peg$computePosDetails(startPos);
+    const endPosDetails = peg$computePosDetails(endPos);
 
-    var res = {
+    const res = {
       source: peg$source,
       start: {
         offset: startPos,
         line: startPosDetails.line,
-        column: startPosDetails.column
+        column: startPosDetails.column,
       },
       end: {
         offset: endPos,
         line: endPosDetails.line,
-        column: endPosDetails.column
-      }
+        column: endPosDetails.column,
+      },
     };
     if (offset && peg$source && (typeof peg$source.offset === "function")) {
       res.start = peg$source.offset(res.start);
@@ -758,7 +661,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsequery() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -771,7 +674,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterList() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = [];
@@ -796,7 +699,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilter() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parsedefaultFilter();
@@ -814,7 +717,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedefaultFilter() {
-    var s0, s1, s2, s3, s4, s5, s6, s7;
+    let s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -853,12 +756,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportFieldDynamic() {
-    var s0, s1, s2, s3, s4, s5, s6, s7;
+    let s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
     if (s1.toLowerCase() === peg$c1) {
-      peg$currPos += 12;
+      peg$currPos += (12);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e1); }
@@ -866,7 +769,7 @@ function peg$parse(input, options) {
     if (s1 === peg$FAILED) {
       s1 = input.substr(peg$currPos, 11);
       if (s1.toLowerCase() === peg$c2) {
-        peg$currPos += 11;
+        peg$currPos += (11);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e2); }
@@ -974,7 +877,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefreeTextFilter() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -1001,7 +904,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseautocompleteKey() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -1160,7 +1063,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterKey() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parseautocompleteKey();
@@ -1174,7 +1077,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseidentifier() {
-    var s0, s1, s2, s3, s4;
+    let s0, s1, s2, s3, s4;
 
     s0 = peg$currPos;
     s1 = peg$currPos;
@@ -1236,12 +1139,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedate() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c4) {
-      peg$currPos += 4;
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e7); }
@@ -1256,12 +1159,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseamount() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c5) {
-      peg$currPos += 6;
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e8); }
@@ -1276,12 +1179,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsemerchant() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c6) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e9); }
@@ -1296,12 +1199,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedescription() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c7) {
-      peg$currPos += 11;
+      peg$currPos += (11);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e10); }
@@ -1316,11 +1219,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportID() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 8);
     if (s0.toLowerCase() === peg$c8) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e11); }
@@ -1329,7 +1232,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 9);
       if (s1.toLowerCase() === peg$c9) {
-        peg$currPos += 9;
+        peg$currPos += (9);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e12); }
@@ -1344,13 +1247,13 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsekeyword() {
-    var s0, s1;
+  function peg$parsein() {
+    let s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 7);
+    s1 = input.substr(peg$currPos, 2);
     if (s1.toLowerCase() === peg$c10) {
-      peg$currPos += 7;
+      peg$currPos += (2);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e13); }
@@ -1364,13 +1267,13 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsein() {
-    var s0, s1;
+  function peg$parsecurrency() {
+    let s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 2);
+    s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c11) {
-      peg$currPos += 2;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e14); }
@@ -1384,48 +1287,28 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsecurrency() {
-    var s0, s1;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c12) {
-      peg$currPos += 8;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e15); }
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f14();
-    }
-    s0 = s1;
-
-    return s0;
-  }
-
   function peg$parsegroupCurrency() {
-    var s0, s1;
+    let s0, s1;
 
-    if (input.substr(peg$currPos, 13) === peg$c13) {
-      s0 = peg$c13;
+    if (input.substr(peg$currPos, 13) === peg$c12) {
+      s0 = peg$c12;
       peg$currPos += 13;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e16); }
+      if (peg$silentFails === 0) { peg$fail(peg$e15); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 14);
-      if (s1.toLowerCase() === peg$c14) {
-        peg$currPos += 14;
+      if (s1.toLowerCase() === peg$c13) {
+        peg$currPos += (14);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e17); }
+        if (peg$silentFails === 0) { peg$fail(peg$e16); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f15();
+        s1 = peg$f14();
       }
       s0 = s1;
     }
@@ -1434,19 +1317,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetag() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c15) {
-      peg$currPos += 3;
+    if (s1.toLowerCase() === peg$c14) {
+      peg$currPos += (3);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e18); }
+      if (peg$silentFails === 0) { peg$fail(peg$e17); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f16();
+      s1 = peg$f15();
     }
     s0 = s1;
 
@@ -1454,19 +1337,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecategory() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c16) {
-      peg$currPos += 8;
+    if (s1.toLowerCase() === peg$c15) {
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e19); }
+      if (peg$silentFails === 0) { peg$fail(peg$e18); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f17();
+      s1 = peg$f16();
     }
     s0 = s1;
 
@@ -1474,19 +1357,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseto() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
-    if (s1.toLowerCase() === peg$c17) {
-      peg$currPos += 2;
+    if (s1.toLowerCase() === peg$c16) {
+      peg$currPos += (2);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e20); }
+      if (peg$silentFails === 0) { peg$fail(peg$e19); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f18();
+      s1 = peg$f17();
     }
     s0 = s1;
 
@@ -1494,19 +1377,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexporter() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c18) {
-      peg$currPos += 8;
+    if (s1.toLowerCase() === peg$c17) {
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e21); }
+      if (peg$silentFails === 0) { peg$fail(peg$e20); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f19();
+      s1 = peg$f18();
     }
     s0 = s1;
 
@@ -1514,19 +1397,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepayer() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c19) {
-      peg$currPos += 5;
+    if (s1.toLowerCase() === peg$c18) {
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e22); }
+      if (peg$silentFails === 0) { peg$fail(peg$e21); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f20();
+      s1 = peg$f19();
     }
     s0 = s1;
 
@@ -1534,27 +1417,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetaxRate() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
-    if (s0.toLowerCase() === peg$c20) {
-      peg$currPos += 7;
+    if (s0.toLowerCase() === peg$c19) {
+      peg$currPos += (7);
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e23); }
+      if (peg$silentFails === 0) { peg$fail(peg$e22); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
-      if (s1.toLowerCase() === peg$c21) {
-        peg$currPos += 8;
+      if (s1.toLowerCase() === peg$c20) {
+        peg$currPos += (8);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e24); }
+        if (peg$silentFails === 0) { peg$fail(peg$e23); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f21();
+        s1 = peg$f20();
       }
       s0 = s1;
     }
@@ -1563,27 +1446,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecardID() {
-    var s0, s1;
+    let s0, s1;
 
-    if (input.substr(peg$currPos, 6) === peg$c22) {
-      s0 = peg$c22;
+    if (input.substr(peg$currPos, 6) === peg$c21) {
+      s0 = peg$c21;
       peg$currPos += 6;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e25); }
+      if (peg$silentFails === 0) { peg$fail(peg$e24); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 4);
-      if (s1.toLowerCase() === peg$c23) {
-        peg$currPos += 4;
+      if (s1.toLowerCase() === peg$c22) {
+        peg$currPos += (4);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e26); }
+        if (peg$silentFails === 0) { peg$fail(peg$e25); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f22();
+        s1 = peg$f21();
       }
       s0 = s1;
     }
@@ -1592,19 +1475,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefrom() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c24) {
-      peg$currPos += 4;
+    if (s1.toLowerCase() === peg$c23) {
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e27); }
+      if (peg$silentFails === 0) { peg$fail(peg$e26); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f23();
+      s1 = peg$f22();
     }
     s0 = s1;
 
@@ -1612,19 +1495,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseattendee() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c25) {
-      peg$currPos += 8;
+    if (s1.toLowerCase() === peg$c24) {
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e28); }
+      if (peg$silentFails === 0) { peg$fail(peg$e27); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f24();
+      s1 = peg$f23();
     }
     s0 = s1;
 
@@ -1632,27 +1515,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexpenseType() {
-    var s0, s1;
+    let s0, s1;
 
-    if (input.substr(peg$currPos, 11) === peg$c26) {
-      s0 = peg$c26;
+    if (input.substr(peg$currPos, 11) === peg$c25) {
+      s0 = peg$c25;
       peg$currPos += 11;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e29); }
+      if (peg$silentFails === 0) { peg$fail(peg$e28); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 12);
-      if (s1.toLowerCase() === peg$c27) {
-        peg$currPos += 12;
+      if (s1.toLowerCase() === peg$c26) {
+        peg$currPos += (12);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e30); }
+        if (peg$silentFails === 0) { peg$fail(peg$e29); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f25();
+        s1 = peg$f24();
       }
       s0 = s1;
     }
@@ -1661,27 +1544,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalType() {
-    var s0, s1;
+    let s0, s1;
 
-    if (input.substr(peg$currPos, 14) === peg$c28) {
-      s0 = peg$c28;
+    if (input.substr(peg$currPos, 14) === peg$c27) {
+      s0 = peg$c27;
       peg$currPos += 14;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e31); }
+      if (peg$silentFails === 0) { peg$fail(peg$e30); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 15);
-      if (s1.toLowerCase() === peg$c29) {
-        peg$currPos += 15;
+      if (s1.toLowerCase() === peg$c28) {
+        peg$currPos += (15);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e32); }
+        if (peg$silentFails === 0) { peg$fail(peg$e31); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f26();
+        s1 = peg$f25();
       }
       s0 = s1;
     }
@@ -1690,27 +1573,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalID() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 12);
-    if (s0.toLowerCase() === peg$c30) {
-      peg$currPos += 12;
+    if (s0.toLowerCase() === peg$c29) {
+      peg$currPos += (12);
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e33); }
+      if (peg$silentFails === 0) { peg$fail(peg$e32); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 13);
-      if (s1.toLowerCase() === peg$c31) {
-        peg$currPos += 13;
+      if (s1.toLowerCase() === peg$c30) {
+        peg$currPos += (13);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e34); }
+        if (peg$silentFails === 0) { peg$fail(peg$e33); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f27();
+        s1 = peg$f26();
       }
       s0 = s1;
     }
@@ -1719,19 +1602,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsebillable() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c32) {
-      peg$currPos += 8;
+    if (s1.toLowerCase() === peg$c31) {
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e35); }
+      if (peg$silentFails === 0) { peg$fail(peg$e34); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f28();
+      s1 = peg$f27();
     }
     s0 = s1;
 
@@ -1739,19 +1622,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereimbursable() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
-    if (s1.toLowerCase() === peg$c33) {
-      peg$currPos += 12;
+    if (s1.toLowerCase() === peg$c32) {
+      peg$currPos += (12);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e36); }
+      if (peg$silentFails === 0) { peg$fail(peg$e35); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f29();
+      s1 = peg$f28();
     }
     s0 = s1;
 
@@ -1759,19 +1642,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetype() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c34) {
-      peg$currPos += 4;
+    if (s1.toLowerCase() === peg$c33) {
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e37); }
+      if (peg$silentFails === 0) { peg$fail(peg$e36); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f30();
+      s1 = peg$f29();
     }
     s0 = s1;
 
@@ -1779,105 +1662,47 @@ function peg$parse(input, options) {
   }
 
   function peg$parsestatus() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c35) {
-      peg$currPos += 6;
+    if (s1.toLowerCase() === peg$c34) {
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e38); }
+      if (peg$silentFails === 0) { peg$fail(peg$e37); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f31();
+      s1 = peg$f30();
     }
     s0 = s1;
 
     return s0;
   }
 
-  function peg$parsesortBy() {
-    var s0, s1;
-
-    if (input.substr(peg$currPos, 6) === peg$c36) {
-      s0 = peg$c36;
-      peg$currPos += 6;
-    } else {
-      s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e39); }
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = input.substr(peg$currPos, 7);
-      if (s1.toLowerCase() === peg$c37) {
-        peg$currPos += 7;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e40); }
-      }
-      if (s1 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$f32();
-      }
-      s0 = s1;
-    }
-
-    return s0;
-  }
-
-  function peg$parsesortOrder() {
-    var s0, s1;
-
-    if (input.substr(peg$currPos, 9) === peg$c38) {
-      s0 = peg$c38;
-      peg$currPos += 9;
-    } else {
-      s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e41); }
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = input.substr(peg$currPos, 10);
-      if (s1.toLowerCase() === peg$c39) {
-        peg$currPos += 10;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e42); }
-      }
-      if (s1 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$f33();
-      }
-      s0 = s1;
-    }
-
-    return s0;
-  }
-
   function peg$parsepolicyID() {
-    var s0, s1;
+    let s0, s1;
 
-    if (input.substr(peg$currPos, 8) === peg$c40) {
-      s0 = peg$c40;
+    if (input.substr(peg$currPos, 8) === peg$c35) {
+      s0 = peg$c35;
       peg$currPos += 8;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e43); }
+      if (peg$silentFails === 0) { peg$fail(peg$e38); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 9);
-      if (s1.toLowerCase() === peg$c41) {
-        peg$currPos += 9;
+      if (s1.toLowerCase() === peg$c36) {
+        peg$currPos += (9);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e44); }
+        if (peg$silentFails === 0) { peg$fail(peg$e39); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f34();
+        s1 = peg$f31();
       }
       s0 = s1;
     }
@@ -1886,19 +1711,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesubmitted() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c42) {
-      peg$currPos += 9;
+    if (s1.toLowerCase() === peg$c37) {
+      peg$currPos += (9);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e45); }
+      if (peg$silentFails === 0) { peg$fail(peg$e40); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f35();
+      s1 = peg$f32();
     }
     s0 = s1;
 
@@ -1906,19 +1731,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseapproved() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c43) {
-      peg$currPos += 8;
+    if (s1.toLowerCase() === peg$c38) {
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e46); }
+      if (peg$silentFails === 0) { peg$fail(peg$e41); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f36();
+      s1 = peg$f33();
     }
     s0 = s1;
 
@@ -1926,19 +1751,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepaid() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c44) {
-      peg$currPos += 4;
+    if (s1.toLowerCase() === peg$c39) {
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e47); }
+      if (peg$silentFails === 0) { peg$fail(peg$e42); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f37();
+      s1 = peg$f34();
     }
     s0 = s1;
 
@@ -1946,19 +1771,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexported() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c45) {
-      peg$currPos += 8;
+    if (s1.toLowerCase() === peg$c40) {
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e48); }
+      if (peg$silentFails === 0) { peg$fail(peg$e43); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f38();
+      s1 = peg$f35();
     }
     s0 = s1;
 
@@ -1966,19 +1791,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseposted() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c46) {
-      peg$currPos += 6;
+    if (s1.toLowerCase() === peg$c41) {
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e49); }
+      if (peg$silentFails === 0) { peg$fail(peg$e44); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f39();
+      s1 = peg$f36();
     }
     s0 = s1;
 
@@ -1986,19 +1811,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawn() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c47) {
-      peg$currPos += 9;
+    if (s1.toLowerCase() === peg$c42) {
+      peg$currPos += (9);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e50); }
+      if (peg$silentFails === 0) { peg$fail(peg$e45); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f40();
+      s1 = peg$f37();
     }
     s0 = s1;
 
@@ -2006,27 +1831,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupBy() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
-    if (s0.toLowerCase() === peg$c48) {
-      peg$currPos += 7;
+    if (s0.toLowerCase() === peg$c43) {
+      peg$currPos += (7);
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e51); }
+      if (peg$silentFails === 0) { peg$fail(peg$e46); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
-      if (s1.toLowerCase() === peg$c49) {
-        peg$currPos += 8;
+      if (s1.toLowerCase() === peg$c44) {
+        peg$currPos += (8);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e52); }
+        if (peg$silentFails === 0) { peg$fail(peg$e47); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f41();
+        s1 = peg$f38();
       }
       s0 = s1;
     }
@@ -2035,19 +1860,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parselimit() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c50) {
-      peg$currPos += 5;
+    if (s1.toLowerCase() === peg$c45) {
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e53); }
+      if (peg$silentFails === 0) { peg$fail(peg$e48); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f42();
+      s1 = peg$f39();
     }
     s0 = s1;
 
@@ -2055,19 +1880,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefeed() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c51) {
-      peg$currPos += 4;
+    if (s1.toLowerCase() === peg$c46) {
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e54); }
+      if (peg$silentFails === 0) { peg$fail(peg$e49); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f43();
+      s1 = peg$f40();
     }
     s0 = s1;
 
@@ -2075,19 +1900,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetitle() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c52) {
-      peg$currPos += 5;
+    if (s1.toLowerCase() === peg$c47) {
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e55); }
+      if (peg$silentFails === 0) { peg$fail(peg$e50); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f44();
+      s1 = peg$f41();
     }
     s0 = s1;
 
@@ -2095,19 +1920,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseassignee() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c53) {
-      peg$currPos += 8;
+    if (s1.toLowerCase() === peg$c48) {
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e56); }
+      if (peg$silentFails === 0) { peg$fail(peg$e51); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f45();
+      s1 = peg$f42();
     }
     s0 = s1;
 
@@ -2115,27 +1940,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecreatedBy() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 9);
-    if (s0.toLowerCase() === peg$c54) {
-      peg$currPos += 9;
+    if (s0.toLowerCase() === peg$c49) {
+      peg$currPos += (9);
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e57); }
+      if (peg$silentFails === 0) { peg$fail(peg$e52); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 10);
-      if (s1.toLowerCase() === peg$c55) {
-        peg$currPos += 10;
+      if (s1.toLowerCase() === peg$c50) {
+        peg$currPos += (10);
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e58); }
+        if (peg$silentFails === 0) { peg$fail(peg$e53); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f46();
+        s1 = peg$f43();
       }
       s0 = s1;
     }
@@ -2144,19 +1969,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseaction() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c56) {
-      peg$currPos += 6;
+    if (s1.toLowerCase() === peg$c51) {
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e59); }
+      if (peg$silentFails === 0) { peg$fail(peg$e54); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f47();
+      s1 = peg$f44();
     }
     s0 = s1;
 
@@ -2164,1438 +1989,204 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetotal() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c57) {
-      peg$currPos += 5;
+    if (s1.toLowerCase() === peg$c52) {
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e60); }
+      if (peg$silentFails === 0) { peg$fail(peg$e55); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f48();
-    }
-    s0 = s1;
-
-    return s0;
-  }
-
-  function peg$parsehas() {
-    var s0, s1;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c58) {
-      peg$currPos += 3;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e61); }
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f49();
-    }
-    s0 = s1;
-
-    return s0;
-  }
-
-  function peg$parseis() {
-    var s0, s1;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 2);
-    if (s1.toLowerCase() === peg$c59) {
-      peg$currPos += 2;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e62); }
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f50();
-    }
-    s0 = s1;
-
-    return s0;
-  }
-
-  function peg$parsepurchaseAmount() {
-    var s0, s1;
-
-    s0 = input.substr(peg$currPos, 14);
-    if (s0.toLowerCase() === peg$c60) {
-      peg$currPos += 14;
-    } else {
-      s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e63); }
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = input.substr(peg$currPos, 15);
-      if (s1.toLowerCase() === peg$c61) {
-        peg$currPos += 15;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e64); }
-      }
-      if (s1 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$f51();
-      }
-      s0 = s1;
-    }
-
-    return s0;
-  }
-
-  function peg$parsepurchaseCurrency() {
-    var s0, s1;
-
-    s0 = input.substr(peg$currPos, 16);
-    if (s0.toLowerCase() === peg$c62) {
-      peg$currPos += 16;
-    } else {
-      s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e65); }
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = input.substr(peg$currPos, 17);
-      if (s1.toLowerCase() === peg$c63) {
-        peg$currPos += 17;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e66); }
-      }
-      if (s1 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$f52();
-      }
-      s0 = s1;
-    }
-
-    return s0;
-  }
-
-  function peg$parsecolumns() {
-    var s0, s1;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 7);
-    if (s1.toLowerCase() === peg$c64) {
-      peg$currPos += 7;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e67); }
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f53();
-    }
-    s0 = s1;
-
-    return s0;
-  }
-
-  function peg$parseview() {
-    var s0, s1;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c65) {
-      peg$currPos += 4;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e68); }
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f54();
-    }
-    s0 = s1;
-
-    return s0;
-  }
-
-  function peg$parsevalues() {
-    var s0, s1, s2;
-
-    s0 = peg$currPos;
-    peg$savedPos = peg$currPos;
-    s1 = peg$f55();
-    if (s1) {
-      s1 = undefined;
-    } else {
-      s1 = peg$FAILED;
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$parsecolumnsValues();
-      if (s2 !== peg$FAILED) {
-        s1 = [s1, s2];
-        s0 = s1;
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$parseperDiem();
-      if (s0 === peg$FAILED) {
-        s0 = peg$parsedraft();
-      }
-    }
-
-    return s0;
-  }
-
-  function peg$parsecolumnsValues() {
-    var s0;
-
-    s0 = peg$parseoriginalAmount();
-    if (s0 === peg$FAILED) {
-      s0 = peg$parsetaxRateValue();
-      if (s0 === peg$FAILED) {
-        s0 = peg$parsetaxAmount();
-        if (s0 === peg$FAILED) {
-          s0 = peg$parsepolicyName();
-          if (s0 === peg$FAILED) {
-            s0 = peg$parsewithdrawalId();
-            if (s0 === peg$FAILED) {
-              s0 = peg$parsebankAccount();
-              if (s0 === peg$FAILED) {
-                s0 = peg$parsereportId();
-                if (s0 === peg$FAILED) {
-                  s0 = peg$parsebase62ReportId();
-                  if (s0 === peg$FAILED) {
-                    s0 = peg$parseexportedToColumnValue();
-                    if (s0 === peg$FAILED) {
-                      s0 = peg$parseexchangeRate();
-                      if (s0 === peg$FAILED) {
-                        s0 = peg$parsereimbursableTotal();
-                        if (s0 === peg$FAILED) {
-                          s0 = peg$parsenonReimbursableTotal();
-                          if (s0 === peg$FAILED) {
-                            s0 = peg$parsegroupFrom();
-                            if (s0 === peg$FAILED) {
-                              s0 = peg$parsegroupExpenses();
-                              if (s0 === peg$FAILED) {
-                                s0 = peg$parsegroupTotal();
-                                if (s0 === peg$FAILED) {
-                                  s0 = peg$parsegroupCard();
-                                  if (s0 === peg$FAILED) {
-                                    s0 = peg$parsegroupFeed();
-                                    if (s0 === peg$FAILED) {
-                                      s0 = peg$parsegroupBankAccount();
-                                      if (s0 === peg$FAILED) {
-                                        s0 = peg$parsegroupWithdrawn();
-                                        if (s0 === peg$FAILED) {
-                                          s0 = peg$parsegroupWithdrawalId();
-                                          if (s0 === peg$FAILED) {
-                                            s0 = peg$parsegroupCategory();
-                                            if (s0 === peg$FAILED) {
-                                              s0 = peg$parsegroupTag();
-                                              if (s0 === peg$FAILED) {
-                                                s0 = peg$parsegroupMerchant();
-                                                if (s0 === peg$FAILED) {
-                                                  s0 = peg$parsegroupMonth();
-                                                  if (s0 === peg$FAILED) {
-                                                    s0 = peg$parsegroupWeek();
-                                                    if (s0 === peg$FAILED) {
-                                                      s0 = peg$parsegroupYear();
-                                                      if (s0 === peg$FAILED) {
-                                                        s0 = peg$parsegroupQuarter();
-                                                      }
-                                                    }
-                                                  }
-                                                }
-                                              }
-                                            }
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-
-    return s0;
-  }
-
-  function peg$parseperDiem() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c66) {
-      peg$currPos += 8;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e69); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f56();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsedraft() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c67) {
-      peg$currPos += 6;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e70); }
-    }
-    if (s1 === peg$FAILED) {
-      s1 = input.substr(peg$currPos, 5);
-      if (s1.toLowerCase() === peg$c68) {
-        peg$currPos += 5;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e71); }
-      }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f57();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parseoriginalAmount() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 15);
-    if (s1.toLowerCase() === peg$c69) {
-      peg$currPos += 15;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e72); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f58();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsetaxAmount() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c70) {
-      peg$currPos += 3;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e73); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f59();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsetaxRateValue() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c21) {
-      peg$currPos += 8;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e24); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f60();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsepolicyName() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c71) {
-      peg$currPos += 11;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e74); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f61();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsewithdrawalId() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 13);
-    if (s1.toLowerCase() === peg$c31) {
-      peg$currPos += 13;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e34); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f62();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsebankAccount() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 12);
-    if (s1.toLowerCase() === peg$c72) {
-      peg$currPos += 12;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e75); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f63();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsereportId() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c73) {
-      peg$currPos += 14;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e76); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f64();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsebase62ReportId() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c9) {
-      peg$currPos += 9;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e12); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f65();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parseexportedToColumnValue() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c74) {
-      peg$currPos += 11;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e77); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f66();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parseexportedToKeyEnd() {
-    var s0, s1, s2;
-
-    s0 = peg$parsewordBoundary();
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = peg$parse_();
-      s2 = input.charAt(peg$currPos);
-      if (peg$r1.test(s2)) {
-        peg$currPos++;
-      } else {
-        s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e78); }
-      }
-      if (s2 !== peg$FAILED) {
-        s1 = [s1, s2];
-        s0 = s1;
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    }
-
-    return s0;
-  }
-
-  function peg$parseexportedTo() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c75) {
-      peg$currPos += 10;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e79); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parseexportedToKeyEnd();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f67();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = input.substr(peg$currPos, 11);
-      if (s1.toLowerCase() === peg$c74) {
-        peg$currPos += 11;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e77); }
-      }
-      if (s1 !== peg$FAILED) {
-        s2 = peg$currPos;
-        peg$silentFails++;
-        s3 = peg$parseexportedToKeyEnd();
-        peg$silentFails--;
-        if (s3 !== peg$FAILED) {
-          peg$currPos = s2;
-          s2 = undefined;
-        } else {
-          s2 = peg$FAILED;
-        }
-        if (s2 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s0 = peg$f68();
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    }
-
-    return s0;
-  }
-
-  function peg$parseexchangeRate() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 13);
-    if (s1.toLowerCase() === peg$c76) {
-      peg$currPos += 13;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e80); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f69();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsereimbursableTotal() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 18);
-    if (s1.toLowerCase() === peg$c77) {
-      peg$currPos += 18;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e81); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f70();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsenonReimbursableTotal() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 22);
-    if (s1.toLowerCase() === peg$c78) {
-      peg$currPos += 22;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e82); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f71();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupFrom() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c79) {
-      peg$currPos += 10;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e83); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f72();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupExpenses() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c80) {
-      peg$currPos += 14;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e84); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f73();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupTotal() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c81) {
-      peg$currPos += 11;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e85); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f74();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupCard() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c82) {
-      peg$currPos += 10;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e86); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f75();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupFeed() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c83) {
-      peg$currPos += 10;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e87); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f76();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupBankAccount() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 18);
-    if (s1.toLowerCase() === peg$c84) {
-      peg$currPos += 18;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e88); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f77();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupWithdrawn() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 15);
-    if (s1.toLowerCase() === peg$c85) {
-      peg$currPos += 15;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e89); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f78();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsegroupWithdrawalId() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 19);
-    if (s1.toLowerCase() === peg$c86) {
-      peg$currPos += 19;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e90); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f79();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
+      s1 = peg$f45();
     }
+    s0 = s1;
 
     return s0;
   }
 
-  function peg$parsegroupCategory() {
-    var s0, s1, s2, s3;
+  function peg$parsehas() {
+    let s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c87) {
-      peg$currPos += 14;
+    s1 = input.substr(peg$currPos, 3);
+    if (s1.toLowerCase() === peg$c53) {
+      peg$currPos += (3);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e91); }
+      if (peg$silentFails === 0) { peg$fail(peg$e56); }
     }
     if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f80();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
+      peg$savedPos = s0;
+      s1 = peg$f46();
     }
+    s0 = s1;
 
     return s0;
   }
 
-  function peg$parsegroupTag() {
-    var s0, s1, s2, s3;
+  function peg$parseis() {
+    let s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c88) {
-      peg$currPos += 9;
+    s1 = input.substr(peg$currPos, 2);
+    if (s1.toLowerCase() === peg$c54) {
+      peg$currPos += (2);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e92); }
+      if (peg$silentFails === 0) { peg$fail(peg$e57); }
     }
     if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f81();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
+      peg$savedPos = s0;
+      s1 = peg$f47();
     }
+    s0 = s1;
 
     return s0;
   }
 
-  function peg$parsegroupMerchant() {
-    var s0, s1, s2, s3;
+  function peg$parsepurchaseAmount() {
+    let s0, s1;
 
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c89) {
-      peg$currPos += 14;
+    s0 = input.substr(peg$currPos, 14);
+    if (s0.toLowerCase() === peg$c55) {
+      peg$currPos += (14);
     } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e93); }
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e58); }
     }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 15);
+      if (s1.toLowerCase() === peg$c56) {
+        peg$currPos += (15);
       } else {
-        s2 = peg$FAILED;
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e59); }
       }
-      if (s2 !== peg$FAILED) {
+      if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f82();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
+        s1 = peg$f48();
       }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
+      s0 = s1;
     }
 
     return s0;
   }
 
-  function peg$parsegroupMonth() {
-    var s0, s1, s2, s3;
+  function peg$parsepurchaseCurrency() {
+    let s0, s1;
 
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c90) {
-      peg$currPos += 11;
+    s0 = input.substr(peg$currPos, 16);
+    if (s0.toLowerCase() === peg$c57) {
+      peg$currPos += (16);
     } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e94); }
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e60); }
     }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 17);
+      if (s1.toLowerCase() === peg$c58) {
+        peg$currPos += (17);
       } else {
-        s2 = peg$FAILED;
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e61); }
       }
-      if (s2 !== peg$FAILED) {
+      if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f83();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
+        s1 = peg$f49();
       }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
+      s0 = s1;
     }
 
     return s0;
   }
 
-  function peg$parsegroupWeek() {
-    var s0, s1, s2, s3;
+  function peg$parsecolumns() {
+    let s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c91) {
-      peg$currPos += 10;
+    s1 = input.substr(peg$currPos, 7);
+    if (s1.toLowerCase() === peg$c59) {
+      peg$currPos += (7);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e95); }
+      if (peg$silentFails === 0) { peg$fail(peg$e62); }
     }
     if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
-      } else {
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f84();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
+      peg$savedPos = s0;
+      s1 = peg$f50();
     }
+    s0 = s1;
 
     return s0;
   }
 
-  function peg$parsegroupYear() {
-    var s0, s1, s2, s3;
+  function peg$parseview() {
+    let s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c92) {
-      peg$currPos += 10;
+    s1 = input.substr(peg$currPos, 4);
+    if (s1.toLowerCase() === peg$c60) {
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e96); }
+      if (peg$silentFails === 0) { peg$fail(peg$e63); }
     }
     if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      s3 = peg$parsewordBoundary();
-      peg$silentFails--;
-      if (s3 !== peg$FAILED) {
-        peg$currPos = s2;
-        s2 = undefined;
+      peg$savedPos = s0;
+      s1 = peg$f51();
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
+  function peg$parseexportedToKeyEnd() {
+    let s0, s1, s2;
+
+    s0 = peg$parsewordBoundary();
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = peg$parse_();
+      s2 = input.charAt(peg$currPos);
+      if (peg$r1.test(s2)) {
+        peg$currPos++;
       } else {
         s2 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e64); }
       }
       if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f85();
+        s1 = [s1, s2];
+        s0 = s1;
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
       }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
     }
 
     return s0;
   }
 
-  function peg$parsegroupQuarter() {
-    var s0, s1, s2, s3;
+  function peg$parseexportedTo() {
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 13);
-    if (s1.toLowerCase() === peg$c93) {
-      peg$currPos += 13;
+    s1 = input.substr(peg$currPos, 10);
+    if (s1.toLowerCase() === peg$c61) {
+      peg$currPos += (10);
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e97); }
+      if (peg$silentFails === 0) { peg$fail(peg$e65); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
       peg$silentFails++;
-      s3 = peg$parsewordBoundary();
+      s3 = peg$parseexportedToKeyEnd();
       peg$silentFails--;
       if (s3 !== peg$FAILED) {
         peg$currPos = s2;
@@ -3605,7 +2196,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f86();
+        s0 = peg$f52();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3614,97 +2205,144 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 11);
+      if (s1.toLowerCase() === peg$c62) {
+        peg$currPos += (11);
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e66); }
+      }
+      if (s1 !== peg$FAILED) {
+        s2 = peg$currPos;
+        peg$silentFails++;
+        s3 = peg$parseexportedToKeyEnd();
+        peg$silentFails--;
+        if (s3 !== peg$FAILED) {
+          peg$currPos = s2;
+          s2 = undefined;
+        } else {
+          s2 = peg$FAILED;
+        }
+        if (s2 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s0 = peg$f53();
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    }
 
     return s0;
   }
 
   function peg$parseoperator() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
-    s1 = input.charAt(peg$currPos);
-    if (peg$r1.test(s1)) {
-      peg$currPos++;
+    if (input.substr(peg$currPos, 2) === peg$c63) {
+      s1 = peg$c63;
+      peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e78); }
+      if (peg$silentFails === 0) { peg$fail(peg$e68); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f87();
+      s1 = peg$f54();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c94) {
-        s1 = peg$c94;
-        peg$currPos += 2;
+      s1 = input.charAt(peg$currPos);
+      if (peg$r1.test(s1)) {
+        peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e99); }
+        if (peg$silentFails === 0) { peg$fail(peg$e64); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f88();
+        s1 = peg$f55();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 2) === peg$c95) {
-          s1 = peg$c95;
+        if (input.substr(peg$currPos, 2) === peg$c64) {
+          s1 = peg$c64;
           peg$currPos += 2;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e100); }
+          if (peg$silentFails === 0) { peg$fail(peg$e69); }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f89();
+          s1 = peg$f56();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
-          if (input.charCodeAt(peg$currPos) === 62) {
-            s1 = peg$c96;
-            peg$currPos++;
+          if (input.substr(peg$currPos, 2) === peg$c65) {
+            s1 = peg$c65;
+            peg$currPos += 2;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e101); }
+            if (peg$silentFails === 0) { peg$fail(peg$e70); }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$f90();
+            s1 = peg$f57();
           }
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 2) === peg$c97) {
-              s1 = peg$c97;
-              peg$currPos += 2;
+            if (input.charCodeAt(peg$currPos) === 62) {
+              s1 = peg$c66;
+              peg$currPos++;
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e102); }
+              if (peg$silentFails === 0) { peg$fail(peg$e71); }
             }
             if (s1 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$f91();
+              s1 = peg$f58();
             }
             s0 = s1;
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
-              if (input.charCodeAt(peg$currPos) === 60) {
-                s1 = peg$c98;
-                peg$currPos++;
+              if (input.substr(peg$currPos, 2) === peg$c67) {
+                s1 = peg$c67;
+                peg$currPos += 2;
               } else {
                 s1 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e103); }
+                if (peg$silentFails === 0) { peg$fail(peg$e72); }
               }
               if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$f92();
+                s1 = peg$f59();
               }
               s0 = s1;
+              if (s0 === peg$FAILED) {
+                s0 = peg$currPos;
+                if (input.charCodeAt(peg$currPos) === 60) {
+                  s1 = peg$c68;
+                  peg$currPos++;
+                } else {
+                  s1 = peg$FAILED;
+                  if (peg$silentFails === 0) { peg$fail(peg$e73); }
+                }
+                if (s1 !== peg$FAILED) {
+                  peg$savedPos = s0;
+                  s1 = peg$f60();
+                }
+                s0 = s1;
+              }
             }
           }
         }
@@ -3713,20 +2351,20 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e98); }
+      if (peg$silentFails === 0) { peg$fail(peg$e67); }
     }
 
     return s0;
   }
 
   function peg$parsefilterOperator() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parseoperator();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f93(s1);
+      s1 = peg$f61(s1);
     }
     s0 = s1;
 
@@ -3734,7 +2372,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsealphanumeric() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -3744,7 +2382,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e105); }
+      if (peg$silentFails === 0) { peg$fail(peg$e75); }
     }
     if (s2 !== peg$FAILED) {
       while (s2 !== peg$FAILED) {
@@ -3754,7 +2392,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e105); }
+          if (peg$silentFails === 0) { peg$fail(peg$e75); }
         }
       }
     } else {
@@ -3762,32 +2400,32 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f94(s1);
+      s1 = peg$f62(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e104); }
+      if (peg$silentFails === 0) { peg$fail(peg$e74); }
     }
 
     return s0;
   }
 
   function peg$parselogicalAnd() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
     peg$savedPos = s0;
-    s1 = peg$f95();
+    s1 = peg$f63();
     s0 = s1;
 
     return s0;
   }
 
   function peg$parse_() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = [];
@@ -3796,7 +2434,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e107); }
+      if (peg$silentFails === 0) { peg$fail(peg$e76); }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
@@ -3805,22 +2443,20 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e107); }
+        if (peg$silentFails === 0) { peg$fail(peg$e76); }
       }
     }
     peg$silentFails--;
-    s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e106); }
 
     return s0;
   }
 
   function peg$parsequotedString() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
-    s1 = peg$f96();
+    s1 = peg$f64();
     if (s1) {
       s1 = undefined;
     } else {
@@ -3847,7 +2483,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesimpleQuotedString() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -3857,7 +2493,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e109); }
+      if (peg$silentFails === 0) { peg$fail(peg$e78); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -3866,7 +2502,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e109); }
+        if (peg$silentFails === 0) { peg$fail(peg$e78); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -3874,7 +2510,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e110); }
+      if (peg$silentFails === 0) { peg$fail(peg$e79); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -3883,7 +2519,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e111); }
+        if (peg$silentFails === 0) { peg$fail(peg$e80); }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
@@ -3892,7 +2528,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e111); }
+          if (peg$silentFails === 0) { peg$fail(peg$e80); }
         }
       }
       s4 = input.charAt(peg$currPos);
@@ -3900,7 +2536,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e110); }
+        if (peg$silentFails === 0) { peg$fail(peg$e79); }
       }
       if (s4 !== peg$FAILED) {
         s5 = [];
@@ -3909,7 +2545,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e105); }
+          if (peg$silentFails === 0) { peg$fail(peg$e75); }
         }
         while (s6 !== peg$FAILED) {
           s5.push(s6);
@@ -3918,11 +2554,11 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e105); }
+            if (peg$silentFails === 0) { peg$fail(peg$e75); }
           }
         }
         peg$savedPos = s0;
-        s0 = peg$f97(s1, s3, s5);
+        s0 = peg$f65(s1, s3, s5);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3934,14 +2570,14 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e108); }
+      if (peg$silentFails === 0) { peg$fail(peg$e77); }
     }
 
     return s0;
   }
 
   function peg$parsenestedQuotedString() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -3951,7 +2587,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e109); }
+      if (peg$silentFails === 0) { peg$fail(peg$e78); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -3960,7 +2596,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e109); }
+        if (peg$silentFails === 0) { peg$fail(peg$e78); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -3968,7 +2604,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e110); }
+      if (peg$silentFails === 0) { peg$fail(peg$e79); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -3977,7 +2613,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e111); }
+        if (peg$silentFails === 0) { peg$fail(peg$e80); }
       }
       if (s4 === peg$FAILED) {
         s4 = peg$currPos;
@@ -3993,15 +2629,15 @@ function peg$parse(input, options) {
         }
         if (s5 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 8220) {
-            s6 = peg$c99;
+            s6 = peg$c69;
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e112); }
+            if (peg$silentFails === 0) { peg$fail(peg$e81); }
           }
           if (s6 !== peg$FAILED) {
             peg$savedPos = s4;
-            s4 = peg$f98(s1);
+            s4 = peg$f66(s1);
           } else {
             peg$currPos = s4;
             s4 = peg$FAILED;
@@ -4024,15 +2660,15 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8221) {
-              s6 = peg$c100;
+              s6 = peg$c70;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e113); }
+              if (peg$silentFails === 0) { peg$fail(peg$e82); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f99(s1);
+              s4 = peg$f67(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -4055,15 +2691,15 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 34) {
-                s6 = peg$c101;
+                s6 = peg$c71;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e114); }
+                if (peg$silentFails === 0) { peg$fail(peg$e83); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f100(s1);
+                s4 = peg$f68(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -4082,7 +2718,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e111); }
+          if (peg$silentFails === 0) { peg$fail(peg$e80); }
         }
         if (s4 === peg$FAILED) {
           s4 = peg$currPos;
@@ -4098,15 +2734,15 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8220) {
-              s6 = peg$c99;
+              s6 = peg$c69;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e112); }
+              if (peg$silentFails === 0) { peg$fail(peg$e81); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f98(s1);
+              s4 = peg$f66(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -4129,15 +2765,15 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 8221) {
-                s6 = peg$c100;
+                s6 = peg$c70;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e113); }
+                if (peg$silentFails === 0) { peg$fail(peg$e82); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f99(s1);
+                s4 = peg$f67(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -4160,15 +2796,15 @@ function peg$parse(input, options) {
               }
               if (s5 !== peg$FAILED) {
                 if (input.charCodeAt(peg$currPos) === 34) {
-                  s6 = peg$c101;
+                  s6 = peg$c71;
                   peg$currPos++;
                 } else {
                   s6 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e114); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e83); }
                 }
                 if (s6 !== peg$FAILED) {
                   peg$savedPos = s4;
-                  s4 = peg$f100(s1);
+                  s4 = peg$f68(s1);
                 } else {
                   peg$currPos = s4;
                   s4 = peg$FAILED;
@@ -4184,7 +2820,7 @@ function peg$parse(input, options) {
       s4 = peg$parseclosingQuote();
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f101(s1, s3, s4);
+        s0 = peg$f69(s1, s3, s4);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4196,14 +2832,14 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e108); }
+      if (peg$silentFails === 0) { peg$fail(peg$e77); }
     }
 
     return s0;
   }
 
   function peg$parseclosingQuote() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.charAt(peg$currPos);
@@ -4211,7 +2847,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e110); }
+      if (peg$silentFails === 0) { peg$fail(peg$e79); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4240,7 +2876,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsevalidClosingCondition() {
-    var s0, s1, s2, s3, s4;
+    let s0, s1, s2, s3, s4;
 
     s0 = peg$currPos;
     s1 = [];
@@ -4249,7 +2885,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e115); }
+      if (peg$silentFails === 0) { peg$fail(peg$e84); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -4258,7 +2894,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e115); }
+        if (peg$silentFails === 0) { peg$fail(peg$e84); }
       }
     }
     s2 = [];
@@ -4267,7 +2903,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s3 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e116); }
+      if (peg$silentFails === 0) { peg$fail(peg$e85); }
     }
     while (s3 !== peg$FAILED) {
       s2.push(s3);
@@ -4276,7 +2912,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e116); }
+        if (peg$silentFails === 0) { peg$fail(peg$e85); }
       }
     }
     s3 = [];
@@ -4285,7 +2921,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s4 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e117); }
+      if (peg$silentFails === 0) { peg$fail(peg$e86); }
     }
     while (s4 !== peg$FAILED) {
       s3.push(s4);
@@ -4294,7 +2930,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e117); }
+        if (peg$silentFails === 0) { peg$fail(peg$e86); }
       }
     }
     s4 = peg$parseoperator();
@@ -4313,7 +2949,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e118); }
+        if (peg$silentFails === 0) { peg$fail(peg$e87); }
       }
       while (s2 !== peg$FAILED) {
         s1.push(s2);
@@ -4322,7 +2958,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e118); }
+          if (peg$silentFails === 0) { peg$fail(peg$e87); }
         }
       }
       s2 = peg$currPos;
@@ -4369,7 +3005,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e119); }
+          if (peg$silentFails === 0) { peg$fail(peg$e88); }
         }
       }
     }
@@ -4378,14 +3014,14 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewordBoundary() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.charAt(peg$currPos);
     if (peg$r12.test(s0)) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e120); }
+      if (peg$silentFails === 0) { peg$fail(peg$e89); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
@@ -4424,30 +3060,36 @@ function peg$parse(input, options) {
 
   peg$result = peg$startRuleFunction();
 
-  if (options.peg$library) {
-    return /** @type {any} */ ({
-      peg$result,
-      peg$currPos,
-      peg$FAILED,
-      peg$maxFailExpected,
-      peg$maxFailPos
-    });
-  }
-  if (peg$result !== peg$FAILED && peg$currPos === input.length) {
-    return peg$result;
-  } else {
+  const peg$success = (peg$result !== peg$FAILED && peg$currPos === input.length);
+  function peg$throw() {
     if (peg$result !== peg$FAILED && peg$currPos < input.length) {
       peg$fail(peg$endExpectation());
     }
 
     throw peg$buildStructuredError(
       peg$maxFailExpected,
-      peg$maxFailPos < input.length ? input.charAt(peg$maxFailPos) : null,
+      peg$maxFailPos < input.length ? peg$getUnicode(peg$maxFailPos) : null,
       peg$maxFailPos < input.length
         ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1)
         : peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
     );
   }
+  if (options.peg$library) {
+    return /** @type {any} */ ({
+      peg$result,
+      peg$currPos,
+      peg$FAILED,
+      peg$maxFailExpected,
+      peg$maxFailPos,
+      peg$success,
+      peg$throw: peg$success ? undefined : peg$throw,
+    });
+  }
+  if (peg$success) {
+    return peg$result;
+  } else {
+    peg$throw();
+  }
 }
 
 const peg$allowedStartRules = [
diff --git a/src/libs/SearchParser/baseRules.peggy b/src/libs/SearchParser/baseRules.peggy
index cc6f3e9fbfcb..ad60a1a0959d 100644
--- a/src/libs/SearchParser/baseRules.peggy
+++ b/src/libs/SearchParser/baseRules.peggy
@@ -157,7 +157,8 @@ groupQuarter            = "group-quarter"i &wordBoundary            { return "gr
 
 
 operator "operator"
-  = (":" / "=") { return "eq"; }
+  = "*:" { return "contains"; }
+  / (":" / "=") { return "eq"; }
   / "!=" { return "neq"; }
   / ">=" { return "gte"; }
   / ">" { return "gt"; }
@@ -167,7 +168,7 @@ operator "operator"
 filterOperator
   = o:operator {
       if (nameOperator) {
-        expectingNestedQuote = (o === "eq"); // Use simple parser if no valid operator is found
+        expectingNestedQuote = (o === "eq" || o === "contains");
       }
       isColumnsContext = false;
       return o;
diff --git a/src/libs/SearchParser/searchParser.js b/src/libs/SearchParser/searchParser.js
index 897055c3bebd..f38d92cffd86 100644
--- a/src/libs/SearchParser/searchParser.js
+++ b/src/libs/SearchParser/searchParser.js
@@ -1,4 +1,4 @@
-// @generated by Peggy 4.0.3.
+// @generated by Peggy 5.0.6.
 //
 // https://peggyjs.org/
 
@@ -12,624 +12,615 @@
     return { operator, left, right };
   }
 
-function peg$subclass(child, parent) {
-  function C() { this.constructor = child; }
-  C.prototype = parent.prototype;
-  child.prototype = new C();
-}
-
-function peg$SyntaxError(message, expected, found, location) {
-  var self = Error.call(this, message);
-  // istanbul ignore next Check is a necessary evil to support older environments
-  if (Object.setPrototypeOf) {
-    Object.setPrototypeOf(self, peg$SyntaxError.prototype);
-  }
-  self.expected = expected;
-  self.found = found;
-  self.location = location;
-  self.name = "SyntaxError";
-  return self;
-}
+class peg$SyntaxError extends SyntaxError {
+  constructor(message, expected, found, location) {
+    super(message);
+    this.expected = expected;
+    this.found = found;
+    this.location = location;
+    this.name = "SyntaxError";
+  }
+
+  format(sources) {
+    let str = "Error: " + this.message;
+    if (this.location) {
+      let src = null;
+      const st = sources.find(s => s.source === this.location.source);
+      if (st) {
+        src = st.text.split(/\r\n|\n|\r/g);
+      }
+      const s = this.location.start;
+      const offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
+        ? this.location.source.offset(s)
+        : s;
+      const loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
+      if (src) {
+        const e = this.location.end;
+        const filler = "".padEnd(offset_s.line.toString().length, " ");
+        const line = src[s.line - 1];
+        const last = s.line === e.line ? e.column : line.length + 1;
+        const hatLen = (last - s.column) || 1;
+        str += "\n --> " + loc + "\n"
+            + filler + " |\n"
+            + offset_s.line + " | " + line + "\n"
+            + filler + " | " + "".padEnd(s.column - 1, " ")
+            + "".padEnd(hatLen, "^");
+      } else {
+        str += "\n at " + loc;
+      }
+    }
+    return str;
+  }
 
-peg$subclass(peg$SyntaxError, Error);
+  static buildMessage(expected, found) {
+    function hex(ch) {
+      return ch.codePointAt(0).toString(16).toUpperCase();
+    }
 
-function peg$padEnd(str, targetLength, padString) {
-  padString = padString || " ";
-  if (str.length > targetLength) { return str; }
-  targetLength -= str.length;
-  padString += padString.repeat(targetLength);
-  return str + padString.slice(0, targetLength);
-}
+    const nonPrintable = Object.prototype.hasOwnProperty.call(RegExp.prototype, "unicode")
+      ? new RegExp("[\\p{C}\\p{Mn}\\p{Mc}]", "gu")
+      : null;
+    function unicodeEscape(s) {
+      if (nonPrintable) {
+        return s.replace(nonPrintable,  ch => "\\u{" + hex(ch) + "}");
+      }
+      return s;
+    }
 
-peg$SyntaxError.prototype.format = function(sources) {
-  var str = "Error: " + this.message;
-  if (this.location) {
-    var src = null;
-    var k;
-    for (k = 0; k < sources.length; k++) {
-      if (sources[k].source === this.location.source) {
-        src = sources[k].text.split(/\r\n|\n|\r/g);
-        break;
-      }
-    }
-    var s = this.location.start;
-    var offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
-      ? this.location.source.offset(s)
-      : s;
-    var loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
-    if (src) {
-      var e = this.location.end;
-      var filler = peg$padEnd("", offset_s.line.toString().length, ' ');
-      var line = src[s.line - 1];
-      var last = s.line === e.line ? e.column : line.length + 1;
-      var hatLen = (last - s.column) || 1;
-      str += "\n --> " + loc + "\n"
-          + filler + " |\n"
-          + offset_s.line + " | " + line + "\n"
-          + filler + " | " + peg$padEnd("", s.column - 1, ' ')
-          + peg$padEnd("", hatLen, "^");
-    } else {
-      str += "\n at " + loc;
-    }
-  }
-  return str;
-};
+    function literalEscape(s) {
+      return unicodeEscape(s
+        .replace(/\\/g, "\\\\")
+        .replace(/"/g,  "\\\"")
+        .replace(/\0/g, "\\0")
+        .replace(/\t/g, "\\t")
+        .replace(/\n/g, "\\n")
+        .replace(/\r/g, "\\r")
+        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
+        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
+    }
 
-peg$SyntaxError.buildMessage = function(expected, found) {
-  var DESCRIBE_EXPECTATION_FNS = {
-    literal: function(expectation) {
-      return "\"" + literalEscape(expectation.text) + "\"";
-    },
+    function classEscape(s) {
+      return unicodeEscape(s
+        .replace(/\\/g, "\\\\")
+        .replace(/\]/g, "\\]")
+        .replace(/\^/g, "\\^")
+        .replace(/-/g,  "\\-")
+        .replace(/\0/g, "\\0")
+        .replace(/\t/g, "\\t")
+        .replace(/\n/g, "\\n")
+        .replace(/\r/g, "\\r")
+        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
+        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
+    }
 
-    class: function(expectation) {
-      var escapedParts = expectation.parts.map(function(part) {
-        return Array.isArray(part)
-          ? classEscape(part[0]) + "-" + classEscape(part[1])
-          : classEscape(part);
-      });
+    const DESCRIBE_EXPECTATION_FNS = {
+      literal(expectation) {
+        return "\"" + literalEscape(expectation.text) + "\"";
+      },
 
-      return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]";
-    },
+      class(expectation) {
+        const escapedParts = expectation.parts.map(
+          part => (Array.isArray(part)
+            ? classEscape(part[0]) + "-" + classEscape(part[1])
+            : classEscape(part))
+        );
 
-    any: function() {
-      return "any character";
-    },
+        return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]" + (expectation.unicode ? "u" : "");
+      },
 
-    end: function() {
-      return "end of input";
-    },
+      any() {
+        return "any character";
+      },
 
-    other: function(expectation) {
-      return expectation.description;
-    }
-  };
+      end() {
+        return "end of input";
+      },
 
-  function hex(ch) {
-    return ch.charCodeAt(0).toString(16).toUpperCase();
-  }
+      other(expectation) {
+        return expectation.description;
+      },
+    };
 
-  function literalEscape(s) {
-    return s
-      .replace(/\\/g, "\\\\")
-      .replace(/"/g,  "\\\"")
-      .replace(/\0/g, "\\0")
-      .replace(/\t/g, "\\t")
-      .replace(/\n/g, "\\n")
-      .replace(/\r/g, "\\r")
-      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
-      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
-  }
+    function describeExpectation(expectation) {
+      return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
+    }
 
-  function classEscape(s) {
-    return s
-      .replace(/\\/g, "\\\\")
-      .replace(/\]/g, "\\]")
-      .replace(/\^/g, "\\^")
-      .replace(/-/g,  "\\-")
-      .replace(/\0/g, "\\0")
-      .replace(/\t/g, "\\t")
-      .replace(/\n/g, "\\n")
-      .replace(/\r/g, "\\r")
-      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
-      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
-  }
+    function describeExpected(expected) {
+      const descriptions = expected.map(describeExpectation);
+      descriptions.sort();
 
-  function describeExpectation(expectation) {
-    return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
-  }
+      if (descriptions.length > 0) {
+        let j = 1;
+        for (let i = 1; i < descriptions.length; i++) {
+          if (descriptions[i - 1] !== descriptions[i]) {
+            descriptions[j] = descriptions[i];
+            j++;
+          }
+        }
+        descriptions.length = j;
+      }
 
-  function describeExpected(expected) {
-    var descriptions = expected.map(describeExpectation);
-    var i, j;
+      switch (descriptions.length) {
+        case 1:
+          return descriptions[0];
 
-    descriptions.sort();
+        case 2:
+          return descriptions[0] + " or " + descriptions[1];
 
-    if (descriptions.length > 0) {
-      for (i = 1, j = 1; i < descriptions.length; i++) {
-        if (descriptions[i - 1] !== descriptions[i]) {
-          descriptions[j] = descriptions[i];
-          j++;
-        }
+        default:
+          return descriptions.slice(0, -1).join(", ")
+            + ", or "
+            + descriptions[descriptions.length - 1];
       }
-      descriptions.length = j;
     }
 
-    switch (descriptions.length) {
-      case 1:
-        return descriptions[0];
-
-      case 2:
-        return descriptions[0] + " or " + descriptions[1];
-
-      default:
-        return descriptions.slice(0, -1).join(", ")
-          + ", or "
-          + descriptions[descriptions.length - 1];
+    function describeFound(found) {
+      return found ? "\"" + literalEscape(found) + "\"" : "end of input";
     }
-  }
 
-  function describeFound(found) {
-    return found ? "\"" + literalEscape(found) + "\"" : "end of input";
+    return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
   }
-
-  return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
-};
+}
 
 function peg$parse(input, options) {
   options = options !== undefined ? options : {};
 
-  var peg$FAILED = {};
-  var peg$source = options.grammarSource;
-
-  var peg$startRuleFunctions = { query: peg$parsequery };
-  var peg$startRuleFunction = peg$parsequery;
-
-  var peg$c0 = "-";
-  var peg$c1 = "report-field";
-  var peg$c2 = "reportfield";
-  var peg$c3 = ",";
-  var peg$c4 = "date";
-  var peg$c5 = "amount";
-  var peg$c6 = "merchant";
-  var peg$c7 = "description";
-  var peg$c8 = "reportid";
-  var peg$c9 = "report-id";
-  var peg$c10 = "keyword";
-  var peg$c11 = "in";
-  var peg$c12 = "currency";
-  var peg$c13 = "groupCurrency";
-  var peg$c14 = "group-currency";
-  var peg$c15 = "tag";
-  var peg$c16 = "category";
-  var peg$c17 = "to";
-  var peg$c18 = "exporter";
-  var peg$c19 = "payer";
-  var peg$c20 = "taxrate";
-  var peg$c21 = "tax-rate";
-  var peg$c22 = "cardID";
-  var peg$c23 = "card";
-  var peg$c24 = "from";
-  var peg$c25 = "attendee";
-  var peg$c26 = "expenseType";
-  var peg$c27 = "expense-type";
-  var peg$c28 = "withdrawalType";
-  var peg$c29 = "withdrawal-type";
-  var peg$c30 = "withdrawalid";
-  var peg$c31 = "withdrawal-id";
-  var peg$c32 = "billable";
-  var peg$c33 = "reimbursable";
-  var peg$c34 = "type";
-  var peg$c35 = "status";
-  var peg$c36 = "sortBy";
-  var peg$c37 = "sort-by";
-  var peg$c38 = "sortOrder";
-  var peg$c39 = "sort-order";
-  var peg$c40 = "policyID";
-  var peg$c41 = "workspace";
-  var peg$c42 = "submitted";
-  var peg$c43 = "approved";
-  var peg$c44 = "paid";
-  var peg$c45 = "exported";
-  var peg$c46 = "posted";
-  var peg$c47 = "withdrawn";
-  var peg$c48 = "groupby";
-  var peg$c49 = "group-by";
-  var peg$c50 = "limit";
-  var peg$c51 = "feed";
-  var peg$c52 = "title";
-  var peg$c53 = "assignee";
-  var peg$c54 = "createdby";
-  var peg$c55 = "created-by";
-  var peg$c56 = "action";
-  var peg$c57 = "total";
-  var peg$c58 = "has";
-  var peg$c59 = "is";
-  var peg$c60 = "purchaseamount";
-  var peg$c61 = "purchase-amount";
-  var peg$c62 = "purchasecurrency";
-  var peg$c63 = "purchase-currency";
-  var peg$c64 = "columns";
-  var peg$c65 = "view";
-  var peg$c66 = "per-diem";
-  var peg$c67 = "drafts";
-  var peg$c68 = "draft";
-  var peg$c69 = "original-amount";
-  var peg$c70 = "tax";
-  var peg$c71 = "policy-name";
-  var peg$c72 = "bank-account";
-  var peg$c73 = "long-report-id";
-  var peg$c74 = "exported-to";
-  var peg$c75 = "exportedto";
-  var peg$c76 = "exchange-rate";
-  var peg$c77 = "reimbursable-total";
-  var peg$c78 = "non-reimbursable-total";
-  var peg$c79 = "group-from";
-  var peg$c80 = "group-expenses";
-  var peg$c81 = "group-total";
-  var peg$c82 = "group-card";
-  var peg$c83 = "group-feed";
-  var peg$c84 = "group-bank-account";
-  var peg$c85 = "group-withdrawn";
-  var peg$c86 = "group-withdrawal-id";
-  var peg$c87 = "group-category";
-  var peg$c88 = "group-tag";
-  var peg$c89 = "group-merchant";
-  var peg$c90 = "group-month";
-  var peg$c91 = "group-week";
-  var peg$c92 = "group-year";
-  var peg$c93 = "group-quarter";
-  var peg$c94 = "!=";
-  var peg$c95 = ">=";
-  var peg$c96 = ">";
-  var peg$c97 = "<=";
-  var peg$c98 = "<";
-  var peg$c99 = "\u201C";
-  var peg$c100 = "\u201D";
-  var peg$c101 = "\"";
-
-  var peg$r0 = /^[^ \t\r\n\xA0]/;
-  var peg$r1 = /^[ \t\r\n\xA0,:=<>!]/;
-  var peg$r2 = /^[:=]/;
-  var peg$r3 = /^[^ ,\t\n\r\xA0]/;
-  var peg$r4 = /^[ \t\r\n\xA0]/;
-  var peg$r5 = /^[^ ,"\u201D\u201C\t\n\r\xA0]/;
-  var peg$r6 = /^["\u201C-\u201D]/;
-  var peg$r7 = /^[^"\u201D\u201C\r\n]/;
-  var peg$r8 = /^[ \t\n\r\xA0a-zA-Z0-9]/;
-  var peg$r9 = /^[a-zA-Z0-9]/;
-  var peg$r10 = /^[ \t\n\r\xA0]/;
-  var peg$r11 = /^[ \t\n\r\xA0a-zA-Z]/;
-  var peg$r12 = /^[,]/;
-  var peg$r13 = /^[ \t\n\r\xA0,]/;
-
-  var peg$e0 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], true, false);
-  var peg$e1 = peg$literalExpectation("-", false);
-  var peg$e2 = peg$literalExpectation("report-field", true);
-  var peg$e3 = peg$literalExpectation("reportfield", true);
-  var peg$e4 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0", ",", ":", "=", "<", ">", "!"], false, false);
-  var peg$e5 = peg$anyExpectation();
-  var peg$e6 = peg$otherExpectation("key");
-  var peg$e7 = peg$otherExpectation("default key");
-  var peg$e8 = peg$literalExpectation(",", false);
-  var peg$e9 = peg$literalExpectation("date", true);
-  var peg$e10 = peg$literalExpectation("amount", true);
-  var peg$e11 = peg$literalExpectation("merchant", true);
-  var peg$e12 = peg$literalExpectation("description", true);
-  var peg$e13 = peg$literalExpectation("reportid", true);
-  var peg$e14 = peg$literalExpectation("report-id", true);
-  var peg$e15 = peg$literalExpectation("keyword", true);
-  var peg$e16 = peg$literalExpectation("in", true);
-  var peg$e17 = peg$literalExpectation("currency", true);
-  var peg$e18 = peg$literalExpectation("groupCurrency", false);
-  var peg$e19 = peg$literalExpectation("group-currency", true);
-  var peg$e20 = peg$literalExpectation("tag", true);
-  var peg$e21 = peg$literalExpectation("category", true);
-  var peg$e22 = peg$literalExpectation("to", true);
-  var peg$e23 = peg$literalExpectation("exporter", true);
-  var peg$e24 = peg$literalExpectation("payer", true);
-  var peg$e25 = peg$literalExpectation("taxRate", true);
-  var peg$e26 = peg$literalExpectation("tax-rate", true);
-  var peg$e27 = peg$literalExpectation("cardID", false);
-  var peg$e28 = peg$literalExpectation("card", true);
-  var peg$e29 = peg$literalExpectation("from", true);
-  var peg$e30 = peg$literalExpectation("attendee", true);
-  var peg$e31 = peg$literalExpectation("expenseType", false);
-  var peg$e32 = peg$literalExpectation("expense-type", true);
-  var peg$e33 = peg$literalExpectation("withdrawalType", false);
-  var peg$e34 = peg$literalExpectation("withdrawal-type", true);
-  var peg$e35 = peg$literalExpectation("withdrawalID", true);
-  var peg$e36 = peg$literalExpectation("withdrawal-id", true);
-  var peg$e37 = peg$literalExpectation("billable", true);
-  var peg$e38 = peg$literalExpectation("reimbursable", true);
-  var peg$e39 = peg$literalExpectation("type", true);
-  var peg$e40 = peg$literalExpectation("status", true);
-  var peg$e41 = peg$literalExpectation("sortBy", false);
-  var peg$e42 = peg$literalExpectation("sort-by", true);
-  var peg$e43 = peg$literalExpectation("sortOrder", false);
-  var peg$e44 = peg$literalExpectation("sort-order", true);
-  var peg$e45 = peg$literalExpectation("policyID", false);
-  var peg$e46 = peg$literalExpectation("workspace", true);
-  var peg$e47 = peg$literalExpectation("submitted", true);
-  var peg$e48 = peg$literalExpectation("approved", true);
-  var peg$e49 = peg$literalExpectation("paid", true);
-  var peg$e50 = peg$literalExpectation("exported", true);
-  var peg$e51 = peg$literalExpectation("posted", true);
-  var peg$e52 = peg$literalExpectation("withdrawn", true);
-  var peg$e53 = peg$literalExpectation("groupBy", true);
-  var peg$e54 = peg$literalExpectation("group-by", true);
-  var peg$e55 = peg$literalExpectation("limit", true);
-  var peg$e56 = peg$literalExpectation("feed", true);
-  var peg$e57 = peg$literalExpectation("title", true);
-  var peg$e58 = peg$literalExpectation("assignee", true);
-  var peg$e59 = peg$literalExpectation("createdBy", true);
-  var peg$e60 = peg$literalExpectation("created-by", true);
-  var peg$e61 = peg$literalExpectation("action", true);
-  var peg$e62 = peg$literalExpectation("total", true);
-  var peg$e63 = peg$literalExpectation("has", true);
-  var peg$e64 = peg$literalExpectation("is", true);
-  var peg$e65 = peg$literalExpectation("purchaseAmount", true);
-  var peg$e66 = peg$literalExpectation("purchase-amount", true);
-  var peg$e67 = peg$literalExpectation("purchaseCurrency", true);
-  var peg$e68 = peg$literalExpectation("purchase-currency", true);
-  var peg$e69 = peg$literalExpectation("columns", true);
-  var peg$e70 = peg$literalExpectation("view", true);
-  var peg$e71 = peg$literalExpectation("per-diem", true);
-  var peg$e72 = peg$literalExpectation("drafts", true);
-  var peg$e73 = peg$literalExpectation("draft", true);
-  var peg$e74 = peg$literalExpectation("original-amount", true);
-  var peg$e75 = peg$literalExpectation("tax", true);
-  var peg$e76 = peg$literalExpectation("policy-name", true);
-  var peg$e77 = peg$literalExpectation("bank-account", true);
-  var peg$e78 = peg$literalExpectation("long-report-id", true);
-  var peg$e79 = peg$literalExpectation("exported-to", true);
-  var peg$e80 = peg$classExpectation([":", "="], false, false);
-  var peg$e81 = peg$literalExpectation("exportedTo", true);
-  var peg$e82 = peg$literalExpectation("exchange-rate", true);
-  var peg$e83 = peg$literalExpectation("reimbursable-total", true);
-  var peg$e84 = peg$literalExpectation("non-reimbursable-total", true);
-  var peg$e85 = peg$literalExpectation("group-from", true);
-  var peg$e86 = peg$literalExpectation("group-expenses", true);
-  var peg$e87 = peg$literalExpectation("group-total", true);
-  var peg$e88 = peg$literalExpectation("group-card", true);
-  var peg$e89 = peg$literalExpectation("group-feed", true);
-  var peg$e90 = peg$literalExpectation("group-bank-account", true);
-  var peg$e91 = peg$literalExpectation("group-withdrawn", true);
-  var peg$e92 = peg$literalExpectation("group-withdrawal-id", true);
-  var peg$e93 = peg$literalExpectation("group-category", true);
-  var peg$e94 = peg$literalExpectation("group-tag", true);
-  var peg$e95 = peg$literalExpectation("group-merchant", true);
-  var peg$e96 = peg$literalExpectation("group-month", true);
-  var peg$e97 = peg$literalExpectation("group-week", true);
-  var peg$e98 = peg$literalExpectation("group-year", true);
-  var peg$e99 = peg$literalExpectation("group-quarter", true);
-  var peg$e100 = peg$otherExpectation("operator");
-  var peg$e101 = peg$literalExpectation("!=", false);
-  var peg$e102 = peg$literalExpectation(">=", false);
-  var peg$e103 = peg$literalExpectation(">", false);
-  var peg$e104 = peg$literalExpectation("<=", false);
-  var peg$e105 = peg$literalExpectation("<", false);
-  var peg$e106 = peg$otherExpectation("word");
-  var peg$e107 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e108 = peg$otherExpectation("whitespace");
-  var peg$e109 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
-  var peg$e110 = peg$otherExpectation("quote");
-  var peg$e111 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e112 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
-  var peg$e113 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
-  var peg$e114 = peg$literalExpectation("\u201C", false);
-  var peg$e115 = peg$literalExpectation("\u201D", false);
-  var peg$e116 = peg$literalExpectation("\"", false);
-  var peg$e117 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e118 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e119 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
-  var peg$e120 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
-  var peg$e121 = peg$classExpectation([","], false, false);
-  var peg$e122 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false);
-
-  var peg$f0 = function(filters) { return applyDefaults(filters); };
-  var peg$f1 = function(head, tail) {
-      const allFilters = [head, ...tail.map(([_, filter]) => filter)]
-        .filter(Boolean)
-        .filter((filter) => filter.right);
-      rawFilterList = allFilters.map(createRawFilter).filter(Boolean);
-
-      const filtersWithoutDefaults = allFilters.filter((filter) => !filter.isDefault);
-
-      if (!filtersWithoutDefaults.length) {
-        return null;
-      }
-
-      const keywords = filtersWithoutDefaults.filter(
-        (filter) =>
-          filter.left === "keyword" || filter.right?.left === "keyword"
-      );
-      const nonKeywords = filtersWithoutDefaults.filter(
-        (filter) =>
-          filter.left !== "keyword" && filter.right?.left !== "keyword"
-      );
-
-      const keywordFilter = buildFilter(
-        "eq",
-        "keyword",
-        keywords
-          .map((filter) => filter.right.replaceAll(/^(['"])(.*)\1$/g, "$2"))
-          .flat()
-      );
-      if (keywordFilter.right.length > 0) {
-        nonKeywords.push(keywordFilter);
-      }
-      return nonKeywords.reduce((result, filter) =>
-        buildFilter("and", result, filter)
-      );
-    };
-  var peg$f2 = function(key, op, value) {
-      updateDefaultValues(key, value);
-      return {...buildFilter(op, key, value), isDefault: true};
-    };
-  var peg$f3 = function(value) {
-      //handle no-breaking space
-      let word;
-      if (Array.isArray(value)) {
-        word = value.join("");
-      } else {
-        word = value;
-      }
-      return buildFilter("eq", "keyword", word);
-    };
-  var peg$f4 = function(neg, field, op, values) {
-      expectingNestedQuote = false; nameOperator = false;
+  const peg$FAILED = {};
+  const peg$source = options.grammarSource;
 
-      const key = field;
-      let operator = op;
+  const peg$startRuleFunctions = {
+    query: peg$parsequery,
+  };
+  let peg$startRuleFunction = peg$parsequery;
+
+  const peg$c0 = "-";
+  const peg$c1 = "report-field";
+  const peg$c2 = "reportfield";
+  const peg$c3 = ",";
+  const peg$c4 = "date";
+  const peg$c5 = "amount";
+  const peg$c6 = "merchant";
+  const peg$c7 = "description";
+  const peg$c8 = "reportid";
+  const peg$c9 = "report-id";
+  const peg$c10 = "keyword";
+  const peg$c11 = "in";
+  const peg$c12 = "currency";
+  const peg$c13 = "groupCurrency";
+  const peg$c14 = "group-currency";
+  const peg$c15 = "tag";
+  const peg$c16 = "category";
+  const peg$c17 = "to";
+  const peg$c18 = "exporter";
+  const peg$c19 = "payer";
+  const peg$c20 = "taxrate";
+  const peg$c21 = "tax-rate";
+  const peg$c22 = "cardID";
+  const peg$c23 = "card";
+  const peg$c24 = "from";
+  const peg$c25 = "attendee";
+  const peg$c26 = "expenseType";
+  const peg$c27 = "expense-type";
+  const peg$c28 = "withdrawalType";
+  const peg$c29 = "withdrawal-type";
+  const peg$c30 = "withdrawalid";
+  const peg$c31 = "withdrawal-id";
+  const peg$c32 = "billable";
+  const peg$c33 = "reimbursable";
+  const peg$c34 = "type";
+  const peg$c35 = "status";
+  const peg$c36 = "sortBy";
+  const peg$c37 = "sort-by";
+  const peg$c38 = "sortOrder";
+  const peg$c39 = "sort-order";
+  const peg$c40 = "policyID";
+  const peg$c41 = "workspace";
+  const peg$c42 = "submitted";
+  const peg$c43 = "approved";
+  const peg$c44 = "paid";
+  const peg$c45 = "exported";
+  const peg$c46 = "posted";
+  const peg$c47 = "withdrawn";
+  const peg$c48 = "groupby";
+  const peg$c49 = "group-by";
+  const peg$c50 = "limit";
+  const peg$c51 = "feed";
+  const peg$c52 = "title";
+  const peg$c53 = "assignee";
+  const peg$c54 = "createdby";
+  const peg$c55 = "created-by";
+  const peg$c56 = "action";
+  const peg$c57 = "total";
+  const peg$c58 = "has";
+  const peg$c59 = "is";
+  const peg$c60 = "purchaseamount";
+  const peg$c61 = "purchase-amount";
+  const peg$c62 = "purchasecurrency";
+  const peg$c63 = "purchase-currency";
+  const peg$c64 = "columns";
+  const peg$c65 = "view";
+  const peg$c66 = "per-diem";
+  const peg$c67 = "drafts";
+  const peg$c68 = "draft";
+  const peg$c69 = "original-amount";
+  const peg$c70 = "tax";
+  const peg$c71 = "policy-name";
+  const peg$c72 = "bank-account";
+  const peg$c73 = "long-report-id";
+  const peg$c74 = "exported-to";
+  const peg$c75 = "exportedto";
+  const peg$c76 = "exchange-rate";
+  const peg$c77 = "reimbursable-total";
+  const peg$c78 = "non-reimbursable-total";
+  const peg$c79 = "group-from";
+  const peg$c80 = "group-expenses";
+  const peg$c81 = "group-total";
+  const peg$c82 = "group-card";
+  const peg$c83 = "group-feed";
+  const peg$c84 = "group-bank-account";
+  const peg$c85 = "group-withdrawn";
+  const peg$c86 = "group-withdrawal-id";
+  const peg$c87 = "group-category";
+  const peg$c88 = "group-tag";
+  const peg$c89 = "group-merchant";
+  const peg$c90 = "group-month";
+  const peg$c91 = "group-week";
+  const peg$c92 = "group-year";
+  const peg$c93 = "group-quarter";
+  const peg$c94 = "*:";
+  const peg$c95 = "!=";
+  const peg$c96 = ">=";
+  const peg$c97 = ">";
+  const peg$c98 = "<=";
+  const peg$c99 = "<";
+  const peg$c100 = "\u201C";
+  const peg$c101 = "\u201D";
+  const peg$c102 = "\"";
+
+  const peg$r0 = /^[^ \t\r\n\xA0]/;
+  const peg$r1 = /^[ \t\r\n\xA0,:=<>!]/;
+  const peg$r2 = /^[:=]/;
+  const peg$r3 = /^[^ ,\t\n\r\xA0]/;
+  const peg$r4 = /^[ \t\r\n\xA0]/;
+  const peg$r5 = /^[^ ,"\u201D\u201C\t\n\r\xA0]/;
+  const peg$r6 = /^["\u201C-\u201D]/;
+  const peg$r7 = /^[^"\u201D\u201C\r\n]/;
+  const peg$r8 = /^[ \t\n\r\xA0a-zA-Z0-9]/;
+  const peg$r9 = /^[a-zA-Z0-9]/;
+  const peg$r10 = /^[ \t\n\r\xA0]/;
+  const peg$r11 = /^[ \t\n\r\xA0a-zA-Z]/;
+  const peg$r12 = /^[,]/;
+  const peg$r13 = /^[ \t\n\r\xA0,]/;
+
+  const peg$e0 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], true, false, false);
+  const peg$e1 = peg$literalExpectation("-", false);
+  const peg$e2 = peg$literalExpectation("report-field", true);
+  const peg$e3 = peg$literalExpectation("reportfield", true);
+  const peg$e4 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0", ",", ":", "=", "<", ">", "!"], false, false, false);
+  const peg$e5 = peg$anyExpectation();
+  const peg$e6 = peg$otherExpectation("key");
+  const peg$e7 = peg$otherExpectation("default key");
+  const peg$e8 = peg$literalExpectation(",", false);
+  const peg$e9 = peg$literalExpectation("date", true);
+  const peg$e10 = peg$literalExpectation("amount", true);
+  const peg$e11 = peg$literalExpectation("merchant", true);
+  const peg$e12 = peg$literalExpectation("description", true);
+  const peg$e13 = peg$literalExpectation("reportid", true);
+  const peg$e14 = peg$literalExpectation("report-id", true);
+  const peg$e15 = peg$literalExpectation("keyword", true);
+  const peg$e16 = peg$literalExpectation("in", true);
+  const peg$e17 = peg$literalExpectation("currency", true);
+  const peg$e18 = peg$literalExpectation("groupCurrency", false);
+  const peg$e19 = peg$literalExpectation("group-currency", true);
+  const peg$e20 = peg$literalExpectation("tag", true);
+  const peg$e21 = peg$literalExpectation("category", true);
+  const peg$e22 = peg$literalExpectation("to", true);
+  const peg$e23 = peg$literalExpectation("exporter", true);
+  const peg$e24 = peg$literalExpectation("payer", true);
+  const peg$e25 = peg$literalExpectation("taxRate", true);
+  const peg$e26 = peg$literalExpectation("tax-rate", true);
+  const peg$e27 = peg$literalExpectation("cardID", false);
+  const peg$e28 = peg$literalExpectation("card", true);
+  const peg$e29 = peg$literalExpectation("from", true);
+  const peg$e30 = peg$literalExpectation("attendee", true);
+  const peg$e31 = peg$literalExpectation("expenseType", false);
+  const peg$e32 = peg$literalExpectation("expense-type", true);
+  const peg$e33 = peg$literalExpectation("withdrawalType", false);
+  const peg$e34 = peg$literalExpectation("withdrawal-type", true);
+  const peg$e35 = peg$literalExpectation("withdrawalID", true);
+  const peg$e36 = peg$literalExpectation("withdrawal-id", true);
+  const peg$e37 = peg$literalExpectation("billable", true);
+  const peg$e38 = peg$literalExpectation("reimbursable", true);
+  const peg$e39 = peg$literalExpectation("type", true);
+  const peg$e40 = peg$literalExpectation("status", true);
+  const peg$e41 = peg$literalExpectation("sortBy", false);
+  const peg$e42 = peg$literalExpectation("sort-by", true);
+  const peg$e43 = peg$literalExpectation("sortOrder", false);
+  const peg$e44 = peg$literalExpectation("sort-order", true);
+  const peg$e45 = peg$literalExpectation("policyID", false);
+  const peg$e46 = peg$literalExpectation("workspace", true);
+  const peg$e47 = peg$literalExpectation("submitted", true);
+  const peg$e48 = peg$literalExpectation("approved", true);
+  const peg$e49 = peg$literalExpectation("paid", true);
+  const peg$e50 = peg$literalExpectation("exported", true);
+  const peg$e51 = peg$literalExpectation("posted", true);
+  const peg$e52 = peg$literalExpectation("withdrawn", true);
+  const peg$e53 = peg$literalExpectation("groupBy", true);
+  const peg$e54 = peg$literalExpectation("group-by", true);
+  const peg$e55 = peg$literalExpectation("limit", true);
+  const peg$e56 = peg$literalExpectation("feed", true);
+  const peg$e57 = peg$literalExpectation("title", true);
+  const peg$e58 = peg$literalExpectation("assignee", true);
+  const peg$e59 = peg$literalExpectation("createdBy", true);
+  const peg$e60 = peg$literalExpectation("created-by", true);
+  const peg$e61 = peg$literalExpectation("action", true);
+  const peg$e62 = peg$literalExpectation("total", true);
+  const peg$e63 = peg$literalExpectation("has", true);
+  const peg$e64 = peg$literalExpectation("is", true);
+  const peg$e65 = peg$literalExpectation("purchaseAmount", true);
+  const peg$e66 = peg$literalExpectation("purchase-amount", true);
+  const peg$e67 = peg$literalExpectation("purchaseCurrency", true);
+  const peg$e68 = peg$literalExpectation("purchase-currency", true);
+  const peg$e69 = peg$literalExpectation("columns", true);
+  const peg$e70 = peg$literalExpectation("view", true);
+  const peg$e71 = peg$literalExpectation("per-diem", true);
+  const peg$e72 = peg$literalExpectation("drafts", true);
+  const peg$e73 = peg$literalExpectation("draft", true);
+  const peg$e74 = peg$literalExpectation("original-amount", true);
+  const peg$e75 = peg$literalExpectation("tax", true);
+  const peg$e76 = peg$literalExpectation("policy-name", true);
+  const peg$e77 = peg$literalExpectation("bank-account", true);
+  const peg$e78 = peg$literalExpectation("long-report-id", true);
+  const peg$e79 = peg$literalExpectation("exported-to", true);
+  const peg$e80 = peg$classExpectation([":", "="], false, false, false);
+  const peg$e81 = peg$literalExpectation("exportedTo", true);
+  const peg$e82 = peg$literalExpectation("exchange-rate", true);
+  const peg$e83 = peg$literalExpectation("reimbursable-total", true);
+  const peg$e84 = peg$literalExpectation("non-reimbursable-total", true);
+  const peg$e85 = peg$literalExpectation("group-from", true);
+  const peg$e86 = peg$literalExpectation("group-expenses", true);
+  const peg$e87 = peg$literalExpectation("group-total", true);
+  const peg$e88 = peg$literalExpectation("group-card", true);
+  const peg$e89 = peg$literalExpectation("group-feed", true);
+  const peg$e90 = peg$literalExpectation("group-bank-account", true);
+  const peg$e91 = peg$literalExpectation("group-withdrawn", true);
+  const peg$e92 = peg$literalExpectation("group-withdrawal-id", true);
+  const peg$e93 = peg$literalExpectation("group-category", true);
+  const peg$e94 = peg$literalExpectation("group-tag", true);
+  const peg$e95 = peg$literalExpectation("group-merchant", true);
+  const peg$e96 = peg$literalExpectation("group-month", true);
+  const peg$e97 = peg$literalExpectation("group-week", true);
+  const peg$e98 = peg$literalExpectation("group-year", true);
+  const peg$e99 = peg$literalExpectation("group-quarter", true);
+  const peg$e100 = peg$otherExpectation("operator");
+  const peg$e101 = peg$literalExpectation("*:", false);
+  const peg$e102 = peg$literalExpectation("!=", false);
+  const peg$e103 = peg$literalExpectation(">=", false);
+  const peg$e104 = peg$literalExpectation(">", false);
+  const peg$e105 = peg$literalExpectation("<=", false);
+  const peg$e106 = peg$literalExpectation("<", false);
+  const peg$e107 = peg$otherExpectation("word");
+  const peg$e108 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false, false);
+  const peg$e109 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false, false);
+  const peg$e110 = peg$otherExpectation("quote");
+  const peg$e111 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false, false);
+  const peg$e112 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false, false);
+  const peg$e113 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false, false);
+  const peg$e114 = peg$literalExpectation("\u201C", false);
+  const peg$e115 = peg$literalExpectation("\u201D", false);
+  const peg$e116 = peg$literalExpectation("\"", false);
+  const peg$e117 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false, false);
+  const peg$e118 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false, false);
+  const peg$e119 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false, false);
+  const peg$e120 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false, false);
+  const peg$e121 = peg$classExpectation([","], false, false, false);
+  const peg$e122 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false, false);
+
+  function peg$f0(filters) {    return applyDefaults(filters);  }
+  function peg$f1(head, tail) {
+    const allFilters = [head, ...tail.map(([_, filter]) => filter)]
+      .filter(Boolean)
+      .filter((filter) => filter.right);
+    rawFilterList = allFilters.map(createRawFilter).filter(Boolean);
+
+    const filtersWithoutDefaults = allFilters.filter((filter) => !filter.isDefault);
+
+    if (!filtersWithoutDefaults.length) {
+      return null;
+    }
 
-      // Apply negation only when "-" is present and the key can be negated
-      if (neg && !nonNegatableKeys.has(key)) {
-        if (operator === "eq") {
-          operator = "neq";
-        }
+    const keywords = filtersWithoutDefaults.filter(
+      (filter) =>
+        filter.left === "keyword" || filter.right?.left === "keyword"
+    );
+    const nonKeywords = filtersWithoutDefaults.filter(
+      (filter) =>
+        filter.left !== "keyword" && filter.right?.left !== "keyword"
+    );
+
+    const keywordFilter = buildFilter(
+      "eq",
+      "keyword",
+      keywords
+        .map((filter) => filter.right.replaceAll(/^(['"])(.*)\1$/g, "$2"))
+        .flat()
+    );
+    if (keywordFilter.right.length > 0) {
+      nonKeywords.push(keywordFilter);
+    }
+    return nonKeywords.reduce((result, filter) =>
+      buildFilter("and", result, filter)
+    );
+  }
+  function peg$f2(key, op, value) {
+    updateDefaultValues(key, value);
+    return {...buildFilter(op, key, value), isDefault: true};
+  }
+  function peg$f3(value) {
+    //handle no-breaking space
+    let word;
+    if (Array.isArray(value)) {
+      word = value.join("");
+    } else {
+      word = value;
+    }
+    return buildFilter("eq", "keyword", word);
+  }
+  function peg$f4(neg, field, op, values) {
+    expectingNestedQuote = false; nameOperator = false;
+
+    const key = field;
+    let operator = op;
+
+    // Apply negation only when "-" is present and the key can be negated
+    if (neg && !nonNegatableKeys.has(key)) {
+      if (operator === "eq") {
+        operator = "neq";
       }
+    }
 
-      return buildFilter(operator, key, values);
-    };
-  var peg$f5 = function(rest) {
-      const suffix = rest.replaceAll(/^-+/g, "");
-      return "reportField-" + (suffix ? suffix : "");
-    };
-  var peg$f6 = function(k) {
-      nameOperator = (k === "from" || k === "to" || k === "payer" || k === "exporter" || k === "attendee" || k === "createdBy" || k === "assignee");
-      return k;
-    };
-  var peg$f7 = function(parts, empty) {
-      const value = parts.flat().filter(Boolean).map((word) => {
-        if (word.startsWith('"') && word.endsWith('"') && word.length >= 2) {
-          return word.slice(1, -1);
-        }
-        return word;
-      });
-      if (value.length > 1) {
-        return value.filter((word) => word.length > 0);
+    return buildFilter(operator, key, values);
+  }
+  function peg$f5(rest) {
+    const suffix = rest.replaceAll(/^-+/g, "");
+    return "reportField-" + (suffix ? suffix : "");
+  }
+  function peg$f6(k) {
+    nameOperator = (k === "from" || k === "to" || k === "payer" || k === "exporter" || k === "attendee" || k === "createdBy" || k === "assignee");
+    return k;
+  }
+  function peg$f7(parts, empty) {
+    const value = parts.flat().filter(Boolean).map((word) => {
+      if (word.startsWith('"') && word.endsWith('"') && word.length >= 2) {
+        return word.slice(1, -1);
       }
-      return value[0];
-    };
-  var peg$f8 = function() { return "date"; };
-  var peg$f9 = function() { return "amount"; };
-  var peg$f10 = function() { return "merchant"; };
-  var peg$f11 = function() { return "description"; };
-  var peg$f12 = function() { return "reportID"; };
-  var peg$f13 = function() { return "keyword"; };
-  var peg$f14 = function() { return "in"; };
-  var peg$f15 = function() { return "currency"; };
-  var peg$f16 = function() { return "groupCurrency"; };
-  var peg$f17 = function() { return "tag"; };
-  var peg$f18 = function() { return "category"; };
-  var peg$f19 = function() { return "to"; };
-  var peg$f20 = function() { return "exporter"; };
-  var peg$f21 = function() { return "payer"; };
-  var peg$f22 = function() { return "taxRate"; };
-  var peg$f23 = function() { return "cardID"; };
-  var peg$f24 = function() { return "from"; };
-  var peg$f25 = function() {return "attendee"};
-  var peg$f26 = function() { return "expenseType"; };
-  var peg$f27 = function() { return "withdrawalType"; };
-  var peg$f28 = function() { return "withdrawalID"; };
-  var peg$f29 = function() { return "billable"; };
-  var peg$f30 = function() { return "reimbursable"; };
-  var peg$f31 = function() { return "type"; };
-  var peg$f32 = function() { return "status"; };
-  var peg$f33 = function() { return "sortBy"; };
-  var peg$f34 = function() { return "sortOrder"; };
-  var peg$f35 = function() { return "policyID"; };
-  var peg$f36 = function() { return "submitted"; };
-  var peg$f37 = function() { return "approved"; };
-  var peg$f38 = function() { return "paid"; };
-  var peg$f39 = function() { return "exported"; };
-  var peg$f40 = function() { return "posted"; };
-  var peg$f41 = function() { return "withdrawn"; };
-  var peg$f42 = function() { return "groupBy"; };
-  var peg$f43 = function() { return "limit"; };
-  var peg$f44 = function() { return "feed"; };
-  var peg$f45 = function() { return "title"; };
-  var peg$f46 = function() { return "assignee"; };
-  var peg$f47 = function() { return "createdBy"; };
-  var peg$f48 = function() { return "action"; };
-  var peg$f49 = function() {return "total"; };
-  var peg$f50 = function() {return "has"; };
-  var peg$f51 = function() {return "is"; };
-  var peg$f52 = function() {return "purchaseAmount"};
-  var peg$f53 = function() {return "purchaseCurrency"};
-  var peg$f54 = function() {
-  isColumnsContext = true;
-  return "columns";
-};
-  var peg$f55 = function() {return "view"};
-  var peg$f56 = function() { return isColumnsContext; };
-  var peg$f57 = function() { return "perDiem"; };
-  var peg$f58 = function() { return "drafts"; };
-  var peg$f59 = function() { return "originalamount"; };
-  var peg$f60 = function() { return "taxAmount"; };
-  var peg$f61 = function() { return "taxrate"; };
-  var peg$f62 = function() { return "policyname"; };
-  var peg$f63 = function() { return "withdrawalID"; };
-  var peg$f64 = function() { return "bankAccount"; };
-  var peg$f65 = function() { return "reportID"; };
-  var peg$f66 = function() { return "base62ReportID"; };
-  var peg$f67 = function() { return "exportedto"; };
-  var peg$f68 = function() { return "exportedTo"; };
-  var peg$f69 = function() { return "exportedTo"; };
-  var peg$f70 = function() { return "exchangeRate"; };
-  var peg$f71 = function() { return "reimbursableTotal"; };
-  var peg$f72 = function() { return "nonReimbursableTotal"; };
-  var peg$f73 = function() { return "groupFrom"; };
-  var peg$f74 = function() { return "groupExpenses"; };
-  var peg$f75 = function() { return "groupTotal"; };
-  var peg$f76 = function() { return "groupCard"; };
-  var peg$f77 = function() { return "groupFeed"; };
-  var peg$f78 = function() { return "groupBankAccount"; };
-  var peg$f79 = function() { return "groupWithdrawn"; };
-  var peg$f80 = function() { return "groupWithdrawalID"; };
-  var peg$f81 = function() { return "groupCategory"; };
-  var peg$f82 = function() { return "groupTag"; };
-  var peg$f83 = function() { return "groupMerchant"; };
-  var peg$f84 = function() { return "groupmonth"; };
-  var peg$f85 = function() { return "groupweek"; };
-  var peg$f86 = function() { return "groupyear"; };
-  var peg$f87 = function() { return "groupquarter"; };
-  var peg$f88 = function() { return "eq"; };
-  var peg$f89 = function() { return "neq"; };
-  var peg$f90 = function() { return "gte"; };
-  var peg$f91 = function() { return "gt"; };
-  var peg$f92 = function() { return "lte"; };
-  var peg$f93 = function() { return "lt"; };
-  var peg$f94 = function(o) {
-      if (nameOperator) {
-        expectingNestedQuote = (o === "eq"); // Use simple parser if no valid operator is found
-      }
-      isColumnsContext = false;
-      return o;
-  };
-  var peg$f95 = function(chars) { return chars.join("").trim(); };
-  var peg$f96 = function() { 
-  isColumnsContext = false;
-  return "and";
-};
-  var peg$f97 = function() { return expectingNestedQuote; };
-  var peg$f98 = function(start, inner, end) { //handle no-breaking space
-      return [...start, '"', ...inner, '"', ...end].join("");
-    };
-  var peg$f99 = function(start) {return "“"};
-  var peg$f100 = function(start) {return "”"};
-  var peg$f101 = function(start) {return "\""};
-  var peg$f102 = function(start, inner, end) {
+      return word;
+    });
+    if (value.length > 1) {
+      return value.filter((word) => word.length > 0);
+    }
+    return value[0];
+  }
+  function peg$f8() {    return "date";  }
+  function peg$f9() {    return "amount";  }
+  function peg$f10() {    return "merchant";  }
+  function peg$f11() {    return "description";  }
+  function peg$f12() {    return "reportID";  }
+  function peg$f13() {    return "keyword";  }
+  function peg$f14() {    return "in";  }
+  function peg$f15() {    return "currency";  }
+  function peg$f16() {    return "groupCurrency";  }
+  function peg$f17() {    return "tag";  }
+  function peg$f18() {    return "category";  }
+  function peg$f19() {    return "to";  }
+  function peg$f20() {    return "exporter";  }
+  function peg$f21() {    return "payer";  }
+  function peg$f22() {    return "taxRate";  }
+  function peg$f23() {    return "cardID";  }
+  function peg$f24() {    return "from";  }
+  function peg$f25() {return "attendee"  }
+  function peg$f26() {    return "expenseType";  }
+  function peg$f27() {    return "withdrawalType";  }
+  function peg$f28() {    return "withdrawalID";  }
+  function peg$f29() {    return "billable";  }
+  function peg$f30() {    return "reimbursable";  }
+  function peg$f31() {    return "type";  }
+  function peg$f32() {    return "status";  }
+  function peg$f33() {    return "sortBy";  }
+  function peg$f34() {    return "sortOrder";  }
+  function peg$f35() {    return "policyID";  }
+  function peg$f36() {    return "submitted";  }
+  function peg$f37() {    return "approved";  }
+  function peg$f38() {    return "paid";  }
+  function peg$f39() {    return "exported";  }
+  function peg$f40() {    return "posted";  }
+  function peg$f41() {    return "withdrawn";  }
+  function peg$f42() {    return "groupBy";  }
+  function peg$f43() {    return "limit";  }
+  function peg$f44() {    return "feed";  }
+  function peg$f45() {    return "title";  }
+  function peg$f46() {    return "assignee";  }
+  function peg$f47() {    return "createdBy";  }
+  function peg$f48() {    return "action";  }
+  function peg$f49() {return "total";  }
+  function peg$f50() {return "has";  }
+  function peg$f51() {return "is";  }
+  function peg$f52() {return "purchaseAmount"  }
+  function peg$f53() {return "purchaseCurrency"  }
+  function peg$f54() {
+    isColumnsContext = true;
+    return "columns";
+  }
+  function peg$f55() {return "view"  }
+  function peg$f56() {    return isColumnsContext;  }
+  function peg$f57() {    return "perDiem";  }
+  function peg$f58() {    return "drafts";  }
+  function peg$f59() {    return "originalamount";  }
+  function peg$f60() {    return "taxAmount";  }
+  function peg$f61() {    return "taxrate";  }
+  function peg$f62() {    return "policyname";  }
+  function peg$f63() {    return "withdrawalID";  }
+  function peg$f64() {    return "bankAccount";  }
+  function peg$f65() {    return "reportID";  }
+  function peg$f66() {    return "base62ReportID";  }
+  function peg$f67() {    return "exportedto";  }
+  function peg$f68() {    return "exportedTo";  }
+  function peg$f69() {    return "exportedTo";  }
+  function peg$f70() {    return "exchangeRate";  }
+  function peg$f71() {    return "reimbursableTotal";  }
+  function peg$f72() {    return "nonReimbursableTotal";  }
+  function peg$f73() {    return "groupFrom";  }
+  function peg$f74() {    return "groupExpenses";  }
+  function peg$f75() {    return "groupTotal";  }
+  function peg$f76() {    return "groupCard";  }
+  function peg$f77() {    return "groupFeed";  }
+  function peg$f78() {    return "groupBankAccount";  }
+  function peg$f79() {    return "groupWithdrawn";  }
+  function peg$f80() {    return "groupWithdrawalID";  }
+  function peg$f81() {    return "groupCategory";  }
+  function peg$f82() {    return "groupTag";  }
+  function peg$f83() {    return "groupMerchant";  }
+  function peg$f84() {    return "groupmonth";  }
+  function peg$f85() {    return "groupweek";  }
+  function peg$f86() {    return "groupyear";  }
+  function peg$f87() {    return "groupquarter";  }
+  function peg$f88() {    return "contains";  }
+  function peg$f89() {    return "eq";  }
+  function peg$f90() {    return "neq";  }
+  function peg$f91() {    return "gte";  }
+  function peg$f92() {    return "gt";  }
+  function peg$f93() {    return "lte";  }
+  function peg$f94() {    return "lt";  }
+  function peg$f95(o) {
+    if (nameOperator) {
+      expectingNestedQuote = (o === "eq" || o === "contains");
+    }
+    isColumnsContext = false;
+    return o;
+  }
+  function peg$f96(chars) {    return chars.join("").trim();  }
+  function peg$f97() {    
+     isColumnsContext = false;
+     return "and";
+  }
+  function peg$f98() {    return expectingNestedQuote;  }
+  function peg$f99(start, inner, end) {    //handle no-breaking space
+         return [...start, '"', ...inner, '"', ...end].join("");
+  }
+  function peg$f100(start) {return "“"  }
+  function peg$f101(start) {return "”"  }
+  function peg$f102(start) {return "\""  }
+  function peg$f103(start, inner, end) {
     return [...start, '"', ...inner, '"'].join("");
-};
-  var peg$currPos = options.peg$currPos | 0;
-  var peg$savedPos = peg$currPos;
-  var peg$posDetailsCache = [{ line: 1, column: 1 }];
-  var peg$maxFailPos = peg$currPos;
-  var peg$maxFailExpected = options.peg$maxFailExpected || [];
-  var peg$silentFails = options.peg$silentFails | 0;
+  }
+  let peg$currPos = options.peg$currPos | 0;
+  let peg$savedPos = peg$currPos;
+  const peg$posDetailsCache = [{ line: 1, column: 1 }];
+  let peg$maxFailPos = peg$currPos;
+  let peg$maxFailExpected = options.peg$maxFailExpected || [];
+  let peg$silentFails = options.peg$silentFails | 0;
 
-  var peg$result;
+  let peg$result;
 
   if (options.startRule) {
     if (!(options.startRule in peg$startRuleFunctions)) {
@@ -651,7 +642,7 @@ function peg$parse(input, options) {
     return {
       source: peg$source,
       start: peg$savedPos,
-      end: peg$currPos
+      end: peg$currPos,
     };
   }
 
@@ -679,12 +670,20 @@ function peg$parse(input, options) {
     throw peg$buildSimpleError(message, location);
   }
 
+  function peg$getUnicode(pos = peg$currPos) {
+    const cp = input.codePointAt(pos);
+    if (cp === undefined) {
+      return "";
+    }
+    return String.fromCodePoint(cp);
+  }
+
   function peg$literalExpectation(text, ignoreCase) {
-    return { type: "literal", text: text, ignoreCase: ignoreCase };
+    return { type: "literal", text, ignoreCase };
   }
 
-  function peg$classExpectation(parts, inverted, ignoreCase) {
-    return { type: "class", parts: parts, inverted: inverted, ignoreCase: ignoreCase };
+  function peg$classExpectation(parts, inverted, ignoreCase, unicode) {
+    return { type: "class", parts, inverted, ignoreCase, unicode };
   }
 
   function peg$anyExpectation() {
@@ -696,12 +695,12 @@ function peg$parse(input, options) {
   }
 
   function peg$otherExpectation(description) {
-    return { type: "other", description: description };
+    return { type: "other", description };
   }
 
   function peg$computePosDetails(pos) {
-    var details = peg$posDetailsCache[pos];
-    var p;
+    let details = peg$posDetailsCache[pos];
+    let p;
 
     if (details) {
       return details;
@@ -716,7 +715,7 @@ function peg$parse(input, options) {
       details = peg$posDetailsCache[p];
       details = {
         line: details.line,
-        column: details.column
+        column: details.column,
       };
 
       while (p < pos) {
@@ -737,21 +736,21 @@ function peg$parse(input, options) {
   }
 
   function peg$computeLocation(startPos, endPos, offset) {
-    var startPosDetails = peg$computePosDetails(startPos);
-    var endPosDetails = peg$computePosDetails(endPos);
+    const startPosDetails = peg$computePosDetails(startPos);
+    const endPosDetails = peg$computePosDetails(endPos);
 
-    var res = {
+    const res = {
       source: peg$source,
       start: {
         offset: startPos,
         line: startPosDetails.line,
-        column: startPosDetails.column
+        column: startPosDetails.column,
       },
       end: {
         offset: endPos,
         line: endPosDetails.line,
-        column: endPosDetails.column
-      }
+        column: endPosDetails.column,
+      },
     };
     if (offset && peg$source && (typeof peg$source.offset === "function")) {
       res.start = peg$source.offset(res.start);
@@ -785,7 +784,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsequery() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -801,7 +800,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterList() {
-    var s0, s1, s2, s3, s4, s5;
+    let s0, s1, s2, s3, s4, s5;
 
     s0 = peg$currPos;
     s1 = peg$parsefilter();
@@ -841,7 +840,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilter() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parsestandardFilter();
@@ -862,7 +861,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedefaultFilter() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -893,7 +892,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefreeTextFilter() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -935,7 +934,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsestandardFilter() {
-    var s0, s1, s2, s3, s4, s5, s6, s7;
+    let s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -976,12 +975,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportFieldDynamic() {
-    var s0, s1, s2, s3, s4, s5, s6, s7;
+    let s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
     if (s1.toLowerCase() === peg$c1) {
-      peg$currPos += 12;
+      peg$currPos += (12);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e2); }
@@ -989,7 +988,7 @@ function peg$parse(input, options) {
     if (s1 === peg$FAILED) {
       s1 = input.substr(peg$currPos, 11);
       if (s1.toLowerCase() === peg$c2) {
-        peg$currPos += 11;
+        peg$currPos += (11);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e3); }
@@ -1097,7 +1096,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsekey() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -1238,7 +1237,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterKey() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parsekey();
@@ -1252,7 +1251,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedefaultKey() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -1297,7 +1296,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseidentifier() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     s0 = peg$currPos;
     s1 = [];
@@ -1420,12 +1419,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedate() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c4) {
-      peg$currPos += 4;
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e9); }
@@ -1440,12 +1439,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseamount() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c5) {
-      peg$currPos += 6;
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e10); }
@@ -1460,12 +1459,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsemerchant() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c6) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e11); }
@@ -1480,12 +1479,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedescription() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c7) {
-      peg$currPos += 11;
+      peg$currPos += (11);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e12); }
@@ -1500,11 +1499,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportID() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 8);
     if (s0.toLowerCase() === peg$c8) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e13); }
@@ -1513,7 +1512,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 9);
       if (s1.toLowerCase() === peg$c9) {
-        peg$currPos += 9;
+        peg$currPos += (9);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e14); }
@@ -1529,12 +1528,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsekeyword() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 7);
     if (s1.toLowerCase() === peg$c10) {
-      peg$currPos += 7;
+      peg$currPos += (7);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e15); }
@@ -1549,12 +1548,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsein() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
     if (s1.toLowerCase() === peg$c11) {
-      peg$currPos += 2;
+      peg$currPos += (2);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e16); }
@@ -1569,12 +1568,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecurrency() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c12) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e17); }
@@ -1589,7 +1588,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupCurrency() {
-    var s0, s1;
+    let s0, s1;
 
     if (input.substr(peg$currPos, 13) === peg$c13) {
       s0 = peg$c13;
@@ -1602,7 +1601,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 14);
       if (s1.toLowerCase() === peg$c14) {
-        peg$currPos += 14;
+        peg$currPos += (14);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e19); }
@@ -1618,12 +1617,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetag() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
     if (s1.toLowerCase() === peg$c15) {
-      peg$currPos += 3;
+      peg$currPos += (3);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e20); }
@@ -1638,12 +1637,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecategory() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c16) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e21); }
@@ -1658,12 +1657,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseto() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
     if (s1.toLowerCase() === peg$c17) {
-      peg$currPos += 2;
+      peg$currPos += (2);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e22); }
@@ -1678,12 +1677,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexporter() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c18) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e23); }
@@ -1698,12 +1697,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepayer() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
     if (s1.toLowerCase() === peg$c19) {
-      peg$currPos += 5;
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e24); }
@@ -1718,11 +1717,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetaxRate() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
     if (s0.toLowerCase() === peg$c20) {
-      peg$currPos += 7;
+      peg$currPos += (7);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e25); }
@@ -1731,7 +1730,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
       if (s1.toLowerCase() === peg$c21) {
-        peg$currPos += 8;
+        peg$currPos += (8);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e26); }
@@ -1747,7 +1746,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecardID() {
-    var s0, s1;
+    let s0, s1;
 
     if (input.substr(peg$currPos, 6) === peg$c22) {
       s0 = peg$c22;
@@ -1760,7 +1759,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 4);
       if (s1.toLowerCase() === peg$c23) {
-        peg$currPos += 4;
+        peg$currPos += (4);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e28); }
@@ -1776,12 +1775,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefrom() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c24) {
-      peg$currPos += 4;
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e29); }
@@ -1796,12 +1795,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseattendee() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c25) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e30); }
@@ -1816,7 +1815,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexpenseType() {
-    var s0, s1;
+    let s0, s1;
 
     if (input.substr(peg$currPos, 11) === peg$c26) {
       s0 = peg$c26;
@@ -1829,7 +1828,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 12);
       if (s1.toLowerCase() === peg$c27) {
-        peg$currPos += 12;
+        peg$currPos += (12);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e32); }
@@ -1845,7 +1844,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalType() {
-    var s0, s1;
+    let s0, s1;
 
     if (input.substr(peg$currPos, 14) === peg$c28) {
       s0 = peg$c28;
@@ -1858,7 +1857,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 15);
       if (s1.toLowerCase() === peg$c29) {
-        peg$currPos += 15;
+        peg$currPos += (15);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e34); }
@@ -1874,11 +1873,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalID() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 12);
     if (s0.toLowerCase() === peg$c30) {
-      peg$currPos += 12;
+      peg$currPos += (12);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e35); }
@@ -1887,7 +1886,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 13);
       if (s1.toLowerCase() === peg$c31) {
-        peg$currPos += 13;
+        peg$currPos += (13);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e36); }
@@ -1903,12 +1902,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsebillable() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c32) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e37); }
@@ -1923,12 +1922,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereimbursable() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
     if (s1.toLowerCase() === peg$c33) {
-      peg$currPos += 12;
+      peg$currPos += (12);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e38); }
@@ -1943,12 +1942,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetype() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c34) {
-      peg$currPos += 4;
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e39); }
@@ -1963,12 +1962,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsestatus() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c35) {
-      peg$currPos += 6;
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e40); }
@@ -1983,7 +1982,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesortBy() {
-    var s0, s1;
+    let s0, s1;
 
     if (input.substr(peg$currPos, 6) === peg$c36) {
       s0 = peg$c36;
@@ -1996,7 +1995,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 7);
       if (s1.toLowerCase() === peg$c37) {
-        peg$currPos += 7;
+        peg$currPos += (7);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e42); }
@@ -2012,7 +2011,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesortOrder() {
-    var s0, s1;
+    let s0, s1;
 
     if (input.substr(peg$currPos, 9) === peg$c38) {
       s0 = peg$c38;
@@ -2025,7 +2024,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 10);
       if (s1.toLowerCase() === peg$c39) {
-        peg$currPos += 10;
+        peg$currPos += (10);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e44); }
@@ -2041,7 +2040,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepolicyID() {
-    var s0, s1;
+    let s0, s1;
 
     if (input.substr(peg$currPos, 8) === peg$c40) {
       s0 = peg$c40;
@@ -2054,7 +2053,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 9);
       if (s1.toLowerCase() === peg$c41) {
-        peg$currPos += 9;
+        peg$currPos += (9);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e46); }
@@ -2070,12 +2069,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesubmitted() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
     if (s1.toLowerCase() === peg$c42) {
-      peg$currPos += 9;
+      peg$currPos += (9);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e47); }
@@ -2090,12 +2089,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseapproved() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c43) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e48); }
@@ -2110,12 +2109,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepaid() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c44) {
-      peg$currPos += 4;
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e49); }
@@ -2130,12 +2129,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexported() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c45) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e50); }
@@ -2150,12 +2149,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseposted() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c46) {
-      peg$currPos += 6;
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e51); }
@@ -2170,12 +2169,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawn() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
     if (s1.toLowerCase() === peg$c47) {
-      peg$currPos += 9;
+      peg$currPos += (9);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e52); }
@@ -2190,11 +2189,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupBy() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
     if (s0.toLowerCase() === peg$c48) {
-      peg$currPos += 7;
+      peg$currPos += (7);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e53); }
@@ -2203,7 +2202,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
       if (s1.toLowerCase() === peg$c49) {
-        peg$currPos += 8;
+        peg$currPos += (8);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e54); }
@@ -2219,12 +2218,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parselimit() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
     if (s1.toLowerCase() === peg$c50) {
-      peg$currPos += 5;
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e55); }
@@ -2239,12 +2238,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefeed() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c51) {
-      peg$currPos += 4;
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e56); }
@@ -2259,12 +2258,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetitle() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
     if (s1.toLowerCase() === peg$c52) {
-      peg$currPos += 5;
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e57); }
@@ -2279,12 +2278,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseassignee() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c53) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e58); }
@@ -2299,11 +2298,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecreatedBy() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 9);
     if (s0.toLowerCase() === peg$c54) {
-      peg$currPos += 9;
+      peg$currPos += (9);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e59); }
@@ -2312,7 +2311,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 10);
       if (s1.toLowerCase() === peg$c55) {
-        peg$currPos += 10;
+        peg$currPos += (10);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e60); }
@@ -2328,12 +2327,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseaction() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c56) {
-      peg$currPos += 6;
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e61); }
@@ -2348,12 +2347,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetotal() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
     if (s1.toLowerCase() === peg$c57) {
-      peg$currPos += 5;
+      peg$currPos += (5);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e62); }
@@ -2368,12 +2367,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsehas() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
     if (s1.toLowerCase() === peg$c58) {
-      peg$currPos += 3;
+      peg$currPos += (3);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e63); }
@@ -2388,12 +2387,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseis() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
     if (s1.toLowerCase() === peg$c59) {
-      peg$currPos += 2;
+      peg$currPos += (2);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e64); }
@@ -2408,11 +2407,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepurchaseAmount() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 14);
     if (s0.toLowerCase() === peg$c60) {
-      peg$currPos += 14;
+      peg$currPos += (14);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e65); }
@@ -2421,7 +2420,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 15);
       if (s1.toLowerCase() === peg$c61) {
-        peg$currPos += 15;
+        peg$currPos += (15);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e66); }
@@ -2437,11 +2436,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepurchaseCurrency() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.substr(peg$currPos, 16);
     if (s0.toLowerCase() === peg$c62) {
-      peg$currPos += 16;
+      peg$currPos += (16);
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e67); }
@@ -2450,7 +2449,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 17);
       if (s1.toLowerCase() === peg$c63) {
-        peg$currPos += 17;
+        peg$currPos += (17);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e68); }
@@ -2466,12 +2465,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecolumns() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 7);
     if (s1.toLowerCase() === peg$c64) {
-      peg$currPos += 7;
+      peg$currPos += (7);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e69); }
@@ -2486,12 +2485,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseview() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c65) {
-      peg$currPos += 4;
+      peg$currPos += (4);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e70); }
@@ -2506,7 +2505,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsevalues() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
@@ -2540,7 +2539,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecolumnsValues() {
-    var s0;
+    let s0;
 
     s0 = peg$parseoriginalAmount();
     if (s0 === peg$FAILED) {
@@ -2626,12 +2625,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseperDiem() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c66) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e71); }
@@ -2663,12 +2662,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedraft() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c67) {
-      peg$currPos += 6;
+      peg$currPos += (6);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e72); }
@@ -2676,7 +2675,7 @@ function peg$parse(input, options) {
     if (s1 === peg$FAILED) {
       s1 = input.substr(peg$currPos, 5);
       if (s1.toLowerCase() === peg$c68) {
-        peg$currPos += 5;
+        peg$currPos += (5);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e73); }
@@ -2709,12 +2708,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseoriginalAmount() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 15);
     if (s1.toLowerCase() === peg$c69) {
-      peg$currPos += 15;
+      peg$currPos += (15);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e74); }
@@ -2746,12 +2745,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetaxAmount() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
     if (s1.toLowerCase() === peg$c70) {
-      peg$currPos += 3;
+      peg$currPos += (3);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e75); }
@@ -2783,12 +2782,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetaxRateValue() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c21) {
-      peg$currPos += 8;
+      peg$currPos += (8);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e26); }
@@ -2820,12 +2819,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepolicyName() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c71) {
-      peg$currPos += 11;
+      peg$currPos += (11);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e76); }
@@ -2857,12 +2856,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalId() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 13);
     if (s1.toLowerCase() === peg$c31) {
-      peg$currPos += 13;
+      peg$currPos += (13);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e36); }
@@ -2894,12 +2893,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsebankAccount() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
     if (s1.toLowerCase() === peg$c72) {
-      peg$currPos += 12;
+      peg$currPos += (12);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e77); }
@@ -2931,12 +2930,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportId() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
     if (s1.toLowerCase() === peg$c73) {
-      peg$currPos += 14;
+      peg$currPos += (14);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e78); }
@@ -2968,12 +2967,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsebase62ReportId() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
     if (s1.toLowerCase() === peg$c9) {
-      peg$currPos += 9;
+      peg$currPos += (9);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e14); }
@@ -3005,12 +3004,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexportedToColumnValue() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c74) {
-      peg$currPos += 11;
+      peg$currPos += (11);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e79); }
@@ -3042,7 +3041,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexportedToKeyEnd() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     s0 = peg$parsewordBoundary();
     if (s0 === peg$FAILED) {
@@ -3068,12 +3067,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexportedTo() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c75) {
-      peg$currPos += 10;
+      peg$currPos += (10);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e81); }
@@ -3104,7 +3103,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 11);
       if (s1.toLowerCase() === peg$c74) {
-        peg$currPos += 11;
+        peg$currPos += (11);
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e79); }
@@ -3137,12 +3136,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexchangeRate() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 13);
     if (s1.toLowerCase() === peg$c76) {
-      peg$currPos += 13;
+      peg$currPos += (13);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e82); }
@@ -3174,12 +3173,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereimbursableTotal() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 18);
     if (s1.toLowerCase() === peg$c77) {
-      peg$currPos += 18;
+      peg$currPos += (18);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e83); }
@@ -3211,12 +3210,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsenonReimbursableTotal() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 22);
     if (s1.toLowerCase() === peg$c78) {
-      peg$currPos += 22;
+      peg$currPos += (22);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e84); }
@@ -3248,12 +3247,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupFrom() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c79) {
-      peg$currPos += 10;
+      peg$currPos += (10);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e85); }
@@ -3285,12 +3284,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupExpenses() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
     if (s1.toLowerCase() === peg$c80) {
-      peg$currPos += 14;
+      peg$currPos += (14);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e86); }
@@ -3322,12 +3321,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupTotal() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c81) {
-      peg$currPos += 11;
+      peg$currPos += (11);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e87); }
@@ -3359,12 +3358,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupCard() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c82) {
-      peg$currPos += 10;
+      peg$currPos += (10);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e88); }
@@ -3396,12 +3395,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupFeed() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c83) {
-      peg$currPos += 10;
+      peg$currPos += (10);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e89); }
@@ -3433,12 +3432,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupBankAccount() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 18);
     if (s1.toLowerCase() === peg$c84) {
-      peg$currPos += 18;
+      peg$currPos += (18);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e90); }
@@ -3470,12 +3469,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupWithdrawn() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 15);
     if (s1.toLowerCase() === peg$c85) {
-      peg$currPos += 15;
+      peg$currPos += (15);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e91); }
@@ -3507,12 +3506,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupWithdrawalId() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 19);
     if (s1.toLowerCase() === peg$c86) {
-      peg$currPos += 19;
+      peg$currPos += (19);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e92); }
@@ -3544,12 +3543,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupCategory() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
     if (s1.toLowerCase() === peg$c87) {
-      peg$currPos += 14;
+      peg$currPos += (14);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e93); }
@@ -3581,12 +3580,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupTag() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
     if (s1.toLowerCase() === peg$c88) {
-      peg$currPos += 9;
+      peg$currPos += (9);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e94); }
@@ -3618,12 +3617,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupMerchant() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
     if (s1.toLowerCase() === peg$c89) {
-      peg$currPos += 14;
+      peg$currPos += (14);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e95); }
@@ -3655,12 +3654,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupMonth() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c90) {
-      peg$currPos += 11;
+      peg$currPos += (11);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e96); }
@@ -3692,12 +3691,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupWeek() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c91) {
-      peg$currPos += 10;
+      peg$currPos += (10);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e97); }
@@ -3729,12 +3728,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupYear() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c92) {
-      peg$currPos += 10;
+      peg$currPos += (10);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e98); }
@@ -3766,12 +3765,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupQuarter() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 13);
     if (s1.toLowerCase() === peg$c93) {
-      peg$currPos += 13;
+      peg$currPos += (13);
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e99); }
@@ -3803,16 +3802,16 @@ function peg$parse(input, options) {
   }
 
   function peg$parseoperator() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
-    s1 = input.charAt(peg$currPos);
-    if (peg$r2.test(s1)) {
-      peg$currPos++;
+    if (input.substr(peg$currPos, 2) === peg$c94) {
+      s1 = peg$c94;
+      peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e80); }
+      if (peg$silentFails === 0) { peg$fail(peg$e101); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -3821,12 +3820,12 @@ function peg$parse(input, options) {
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c94) {
-        s1 = peg$c94;
-        peg$currPos += 2;
+      s1 = input.charAt(peg$currPos);
+      if (peg$r2.test(s1)) {
+        peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e101); }
+        if (peg$silentFails === 0) { peg$fail(peg$e80); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
@@ -3849,9 +3848,9 @@ function peg$parse(input, options) {
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
-          if (input.charCodeAt(peg$currPos) === 62) {
+          if (input.substr(peg$currPos, 2) === peg$c96) {
             s1 = peg$c96;
-            peg$currPos++;
+            peg$currPos += 2;
           } else {
             s1 = peg$FAILED;
             if (peg$silentFails === 0) { peg$fail(peg$e103); }
@@ -3863,9 +3862,9 @@ function peg$parse(input, options) {
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 2) === peg$c97) {
+            if (input.charCodeAt(peg$currPos) === 62) {
               s1 = peg$c97;
-              peg$currPos += 2;
+              peg$currPos++;
             } else {
               s1 = peg$FAILED;
               if (peg$silentFails === 0) { peg$fail(peg$e104); }
@@ -3877,9 +3876,9 @@ function peg$parse(input, options) {
             s0 = s1;
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
-              if (input.charCodeAt(peg$currPos) === 60) {
+              if (input.substr(peg$currPos, 2) === peg$c98) {
                 s1 = peg$c98;
-                peg$currPos++;
+                peg$currPos += 2;
               } else {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) { peg$fail(peg$e105); }
@@ -3889,6 +3888,21 @@ function peg$parse(input, options) {
                 s1 = peg$f93();
               }
               s0 = s1;
+              if (s0 === peg$FAILED) {
+                s0 = peg$currPos;
+                if (input.charCodeAt(peg$currPos) === 60) {
+                  s1 = peg$c99;
+                  peg$currPos++;
+                } else {
+                  s1 = peg$FAILED;
+                  if (peg$silentFails === 0) { peg$fail(peg$e106); }
+                }
+                if (s1 !== peg$FAILED) {
+                  peg$savedPos = s0;
+                  s1 = peg$f94();
+                }
+                s0 = s1;
+              }
             }
           }
         }
@@ -3904,13 +3918,13 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterOperator() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parseoperator();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f94(s1);
+      s1 = peg$f95(s1);
     }
     s0 = s1;
 
@@ -3918,7 +3932,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsealphanumeric() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -3928,7 +3942,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e107); }
+      if (peg$silentFails === 0) { peg$fail(peg$e108); }
     }
     if (s2 !== peg$FAILED) {
       while (s2 !== peg$FAILED) {
@@ -3938,7 +3952,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e107); }
+          if (peg$silentFails === 0) { peg$fail(peg$e108); }
         }
       }
     } else {
@@ -3946,32 +3960,32 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f95(s1);
+      s1 = peg$f96(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e106); }
+      if (peg$silentFails === 0) { peg$fail(peg$e107); }
     }
 
     return s0;
   }
 
   function peg$parselogicalAnd() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
     peg$savedPos = s0;
-    s1 = peg$f96();
+    s1 = peg$f97();
     s0 = s1;
 
     return s0;
   }
 
   function peg$parse_() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = [];
@@ -3993,18 +4007,16 @@ function peg$parse(input, options) {
       }
     }
     peg$silentFails--;
-    s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e108); }
 
     return s0;
   }
 
   function peg$parsequotedString() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
-    s1 = peg$f97();
+    s1 = peg$f98();
     if (s1) {
       s1 = undefined;
     } else {
@@ -4031,7 +4043,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesimpleQuotedString() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -4093,7 +4105,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e107); }
+          if (peg$silentFails === 0) { peg$fail(peg$e108); }
         }
         while (s6 !== peg$FAILED) {
           s5.push(s6);
@@ -4102,11 +4114,11 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e107); }
+            if (peg$silentFails === 0) { peg$fail(peg$e108); }
           }
         }
         peg$savedPos = s0;
-        s0 = peg$f98(s1, s3, s5);
+        s0 = peg$f99(s1, s3, s5);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4125,7 +4137,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsenestedQuotedString() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -4177,7 +4189,7 @@ function peg$parse(input, options) {
         }
         if (s5 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 8220) {
-            s6 = peg$c99;
+            s6 = peg$c100;
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
@@ -4185,7 +4197,7 @@ function peg$parse(input, options) {
           }
           if (s6 !== peg$FAILED) {
             peg$savedPos = s4;
-            s4 = peg$f99(s1);
+            s4 = peg$f100(s1);
           } else {
             peg$currPos = s4;
             s4 = peg$FAILED;
@@ -4208,7 +4220,7 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8221) {
-              s6 = peg$c100;
+              s6 = peg$c101;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
@@ -4216,7 +4228,7 @@ function peg$parse(input, options) {
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f100(s1);
+              s4 = peg$f101(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -4239,7 +4251,7 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 34) {
-                s6 = peg$c101;
+                s6 = peg$c102;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
@@ -4247,7 +4259,7 @@ function peg$parse(input, options) {
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f101(s1);
+                s4 = peg$f102(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -4282,7 +4294,7 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8220) {
-              s6 = peg$c99;
+              s6 = peg$c100;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
@@ -4290,7 +4302,7 @@ function peg$parse(input, options) {
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f99(s1);
+              s4 = peg$f100(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -4313,7 +4325,7 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 8221) {
-                s6 = peg$c100;
+                s6 = peg$c101;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
@@ -4321,7 +4333,7 @@ function peg$parse(input, options) {
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f100(s1);
+                s4 = peg$f101(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -4344,7 +4356,7 @@ function peg$parse(input, options) {
               }
               if (s5 !== peg$FAILED) {
                 if (input.charCodeAt(peg$currPos) === 34) {
-                  s6 = peg$c101;
+                  s6 = peg$c102;
                   peg$currPos++;
                 } else {
                   s6 = peg$FAILED;
@@ -4352,7 +4364,7 @@ function peg$parse(input, options) {
                 }
                 if (s6 !== peg$FAILED) {
                   peg$savedPos = s4;
-                  s4 = peg$f101(s1);
+                  s4 = peg$f102(s1);
                 } else {
                   peg$currPos = s4;
                   s4 = peg$FAILED;
@@ -4368,7 +4380,7 @@ function peg$parse(input, options) {
       s4 = peg$parseclosingQuote();
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f102(s1, s3, s4);
+        s0 = peg$f103(s1, s3, s4);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4387,7 +4399,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseclosingQuote() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.charAt(peg$currPos);
@@ -4424,7 +4436,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsevalidClosingCondition() {
-    var s0, s1, s2, s3, s4;
+    let s0, s1, s2, s3, s4;
 
     s0 = peg$currPos;
     s1 = [];
@@ -4562,7 +4574,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewordBoundary() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = input.charAt(peg$currPos);
     if (peg$r13.test(s0)) {
@@ -4749,30 +4761,36 @@ function peg$parse(input, options) {
 
   peg$result = peg$startRuleFunction();
 
-  if (options.peg$library) {
-    return /** @type {any} */ ({
-      peg$result,
-      peg$currPos,
-      peg$FAILED,
-      peg$maxFailExpected,
-      peg$maxFailPos
-    });
-  }
-  if (peg$result !== peg$FAILED && peg$currPos === input.length) {
-    return peg$result;
-  } else {
+  const peg$success = (peg$result !== peg$FAILED && peg$currPos === input.length);
+  function peg$throw() {
     if (peg$result !== peg$FAILED && peg$currPos < input.length) {
       peg$fail(peg$endExpectation());
     }
 
     throw peg$buildStructuredError(
       peg$maxFailExpected,
-      peg$maxFailPos < input.length ? input.charAt(peg$maxFailPos) : null,
+      peg$maxFailPos < input.length ? peg$getUnicode(peg$maxFailPos) : null,
       peg$maxFailPos < input.length
         ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1)
         : peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
     );
   }
+  if (options.peg$library) {
+    return /** @type {any} */ ({
+      peg$result,
+      peg$currPos,
+      peg$FAILED,
+      peg$maxFailExpected,
+      peg$maxFailPos,
+      peg$success,
+      peg$throw: peg$success ? undefined : peg$throw,
+    });
+  }
+  if (peg$success) {
+    return peg$result;
+  } else {
+    peg$throw();
+  }
 }
 
 const peg$allowedStartRules = [
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index c8971df55ea6..ec4f17efa6f2 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -688,7 +688,14 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
             ) {
                 const keyInCorrectForm = (Object.keys(CONST.SEARCH.SYNTAX_FILTER_KEYS) as FilterKeys[]).find((key) => CONST.SEARCH.SYNTAX_FILTER_KEYS[key] === filterKey);
                 if (keyInCorrectForm) {
-                    return `${prefix}${CONST.SEARCH.SYNTAX_FILTER_KEYS[keyInCorrectForm]}:${sanitizeSearchValue(filterValue as string)}`;
+                    // For merchant filters:
+                    // - Non-negated: use *: (contains) for partial matching
+                    // - Negated: use : (eq) so parser correctly converts to neq operator
+                    const operator =
+                        filterKey === FILTER_KEYS.MERCHANT && !isNegated
+                            ? operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS]
+                            : operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO];
+                    return `${prefix}${CONST.SEARCH.SYNTAX_FILTER_KEYS[keyInCorrectForm]}${operator}${sanitizeSearchValue(filterValue as string)}`;
                 }
             }
             if ((filterKey === FILTER_KEYS.REPORT_ID || filterKey === FILTER_KEYS.WITHDRAWAL_ID) && filterValue) {
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index 444323137e27..9cc14a24a681 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -182,7 +182,7 @@ describe('SearchQueryUtils', () => {
 
             const result = buildQueryStringFromFilterFormValues(filterValues);
 
-            expect(result).toEqual('type:expense policyID:67890 merchant:Amazon description:Electronics laptop category:electronics,gadgets');
+            expect(result).toEqual('type:expense policyID:67890 merchant*:Amazon description:Electronics laptop category:electronics,gadgets');
         });
 
         test('currencies and categories', () => {
@@ -323,7 +323,7 @@ describe('SearchQueryUtils', () => {
 
                 const result = buildQueryStringFromFilterFormValues(filterValues, {sortBy: 'amount', sortOrder: 'asc', limit: 25});
 
-                expect(result).toEqual('sortBy:amount sortOrder:asc type:expense merchant:Amazon limit:25');
+                expect(result).toEqual('sortBy:amount sortOrder:asc type:expense merchant*:Amazon limit:25');
             });
 
             test('omits limit when not provided', () => {

From 390eed169ff76619626343b14b98caabf10cd0c8 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Fri, 20 Mar 2026 00:56:35 +0700
Subject: [PATCH 03/38] Regenerate parser files with Peggy 4.0.3 to match
 package.json

Previously generated with Peggy 5.0.6 which caused AssertionError
on compile. Regenerated using npm run generate-search-parser and
generate-autocomplete-parser with installed Peggy 4.0.3.
---
 src/libs/SearchParser/autocompleteParser.js | 3232 +++++++++++++------
 src/libs/SearchParser/searchParser.js       | 1684 +++++-----
 2 files changed, 3146 insertions(+), 1770 deletions(-)

diff --git a/src/libs/SearchParser/autocompleteParser.js b/src/libs/SearchParser/autocompleteParser.js
index 8bbd481fb0ab..ff2b2ebe4878 100644
--- a/src/libs/SearchParser/autocompleteParser.js
+++ b/src/libs/SearchParser/autocompleteParser.js
@@ -1,6 +1,7 @@
 'worklet'
 
-// @generated by Peggy 5.0.6.
+class peg$SyntaxError{}
+// @generated by Peggy 4.0.3.
 //
 // https://peggyjs.org/
 
@@ -10,494 +11,601 @@
 // To make changes, edit the corresponding *.peggy files only.
 // Use the `generate-search-parser` and `generate-autocomplete-parser` scripts to regenerate parsers after modifications.
 
-class peg$SyntaxError extends SyntaxError {
-  constructor(message, expected, found, location) {
-    super(message);
-    this.expected = expected;
-    this.found = found;
-    this.location = location;
-    this.name = "SyntaxError";
-  }
-
-  format(sources) {
-    let str = "Error: " + this.message;
-    if (this.location) {
-      let src = null;
-      const st = sources.find(s => s.source === this.location.source);
-      if (st) {
-        src = st.text.split(/\r\n|\n|\r/g);
-      }
-      const s = this.location.start;
-      const offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
-        ? this.location.source.offset(s)
-        : s;
-      const loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
-      if (src) {
-        const e = this.location.end;
-        const filler = "".padEnd(offset_s.line.toString().length, " ");
-        const line = src[s.line - 1];
-        const last = s.line === e.line ? e.column : line.length + 1;
-        const hatLen = (last - s.column) || 1;
-        str += "\n --> " + loc + "\n"
-            + filler + " |\n"
-            + offset_s.line + " | " + line + "\n"
-            + filler + " | " + "".padEnd(s.column - 1, " ")
-            + "".padEnd(hatLen, "^");
-      } else {
-        str += "\n at " + loc;
-      }
-    }
-    return str;
-  }
-
-  static buildMessage(expected, found) {
-    function hex(ch) {
-      return ch.codePointAt(0).toString(16).toUpperCase();
-    }
-
-    const nonPrintable = Object.prototype.hasOwnProperty.call(RegExp.prototype, "unicode")
-      ? new RegExp("[\\p{C}\\p{Mn}\\p{Mc}]", "gu")
-      : null;
-    function unicodeEscape(s) {
-      if (nonPrintable) {
-        return s.replace(nonPrintable,  ch => "\\u{" + hex(ch) + "}");
-      }
-      return s;
-    }
-
-    function literalEscape(s) {
-      return unicodeEscape(s
-        .replace(/\\/g, "\\\\")
-        .replace(/"/g,  "\\\"")
-        .replace(/\0/g, "\\0")
-        .replace(/\t/g, "\\t")
-        .replace(/\n/g, "\\n")
-        .replace(/\r/g, "\\r")
-        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
-        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
-    }
-
-    function classEscape(s) {
-      return unicodeEscape(s
-        .replace(/\\/g, "\\\\")
-        .replace(/\]/g, "\\]")
-        .replace(/\^/g, "\\^")
-        .replace(/-/g,  "\\-")
-        .replace(/\0/g, "\\0")
-        .replace(/\t/g, "\\t")
-        .replace(/\n/g, "\\n")
-        .replace(/\r/g, "\\r")
-        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
-        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
-    }
-
-    const DESCRIBE_EXPECTATION_FNS = {
-      literal(expectation) {
-        return "\"" + literalEscape(expectation.text) + "\"";
-      },
+function peg$subclass(child, parent) {
+  function C() { this.constructor = child; }
+  C.prototype = parent.prototype;
+  child.prototype = new C();
+}
 
-      class(expectation) {
-        const escapedParts = expectation.parts.map(
-          part => (Array.isArray(part)
-            ? classEscape(part[0]) + "-" + classEscape(part[1])
-            : classEscape(part))
-        );
+function temporary(message, expected, found, location) {
+  var self = Error.call(this, message);
+  // istanbul ignore next Check is a necessary evil to support older environments
+  if (Object.setPrototypeOf) {
+    Object.setPrototypeOf(self, peg$SyntaxError.prototype);
+  }
+  self.expected = expected;
+  self.found = found;
+  self.location = location;
+  self.name = "SyntaxError";
+  return self;
+}
 
-        return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]" + (expectation.unicode ? "u" : "");
-      },
 
-      any() {
-        return "any character";
-      },
 
-      end() {
-        return "end of input";
-      },
+function peg$padEnd(str, targetLength, padString) {
+  padString = padString || " ";
+  if (str.length > targetLength) { return str; }
+  targetLength -= str.length;
+  padString += padString.repeat(targetLength);
+  return str + padString.slice(0, targetLength);
+}
 
-      other(expectation) {
-        return expectation.description;
-      },
-    };
+peg$SyntaxError.prototype.format = function(sources) {
+  var str = "Error: " + this.message;
+  if (this.location) {
+    var src = null;
+    var k;
+    for (k = 0; k < sources.length; k++) {
+      if (sources[k].source === this.location.source) {
+        src = sources[k].text.split(/\r\n|\n|\r/g);
+        break;
+      }
+    }
+    var s = this.location.start;
+    var offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
+      ? this.location.source.offset(s)
+      : s;
+    var loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
+    if (src) {
+      var e = this.location.end;
+      var filler = peg$padEnd("", offset_s.line.toString().length, ' ');
+      var line = src[s.line - 1];
+      var last = s.line === e.line ? e.column : line.length + 1;
+      var hatLen = (last - s.column) || 1;
+      str += "\n --> " + loc + "\n"
+          + filler + " |\n"
+          + offset_s.line + " | " + line + "\n"
+          + filler + " | " + peg$padEnd("", s.column - 1, ' ')
+          + peg$padEnd("", hatLen, "^");
+    } else {
+      str += "\n at " + loc;
+    }
+  }
+  return str;
+};
 
-    function describeExpectation(expectation) {
-      return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
+peg$SyntaxError.buildMessage = function(expected, found) {
+  var DESCRIBE_EXPECTATION_FNS = {
+    literal: function(expectation) {
+      return "\"" + literalEscape(expectation.text) + "\"";
+    },
+
+    class: function(expectation) {
+      var escapedParts = expectation.parts.map(function(part) {
+        return Array.isArray(part)
+          ? classEscape(part[0]) + "-" + classEscape(part[1])
+          : classEscape(part);
+      });
+
+      return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]";
+    },
+
+    any: function() {
+      return "any character";
+    },
+
+    end: function() {
+      return "end of input";
+    },
+
+    other: function(expectation) {
+      return expectation.description;
     }
+  };
 
-    function describeExpected(expected) {
-      const descriptions = expected.map(describeExpectation);
-      descriptions.sort();
+  function hex(ch) {
+    return ch.charCodeAt(0).toString(16).toUpperCase();
+  }
 
-      if (descriptions.length > 0) {
-        let j = 1;
-        for (let i = 1; i < descriptions.length; i++) {
-          if (descriptions[i - 1] !== descriptions[i]) {
-            descriptions[j] = descriptions[i];
-            j++;
-          }
-        }
-        descriptions.length = j;
-      }
+  function literalEscape(s) {
+    return s
+      .replace(/\\/g, "\\\\")
+      .replace(/"/g,  "\\\"")
+      .replace(/\0/g, "\\0")
+      .replace(/\t/g, "\\t")
+      .replace(/\n/g, "\\n")
+      .replace(/\r/g, "\\r")
+      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
+      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
+  }
+
+  function classEscape(s) {
+    return s
+      .replace(/\\/g, "\\\\")
+      .replace(/\]/g, "\\]")
+      .replace(/\^/g, "\\^")
+      .replace(/-/g,  "\\-")
+      .replace(/\0/g, "\\0")
+      .replace(/\t/g, "\\t")
+      .replace(/\n/g, "\\n")
+      .replace(/\r/g, "\\r")
+      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
+      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
+  }
+
+  function describeExpectation(expectation) {
+    return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
+  }
 
-      switch (descriptions.length) {
-        case 1:
-          return descriptions[0];
+  function describeExpected(expected) {
+    var descriptions = expected.map(describeExpectation);
+    var i, j;
 
-        case 2:
-          return descriptions[0] + " or " + descriptions[1];
+    descriptions.sort();
 
-        default:
-          return descriptions.slice(0, -1).join(", ")
-            + ", or "
-            + descriptions[descriptions.length - 1];
+    if (descriptions.length > 0) {
+      for (i = 1, j = 1; i < descriptions.length; i++) {
+        if (descriptions[i - 1] !== descriptions[i]) {
+          descriptions[j] = descriptions[i];
+          j++;
+        }
       }
+      descriptions.length = j;
     }
 
-    function describeFound(found) {
-      return found ? "\"" + literalEscape(found) + "\"" : "end of input";
+    switch (descriptions.length) {
+      case 1:
+        return descriptions[0];
+
+      case 2:
+        return descriptions[0] + " or " + descriptions[1];
+
+      default:
+        return descriptions.slice(0, -1).join(", ")
+          + ", or "
+          + descriptions[descriptions.length - 1];
     }
+  }
 
-    return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
+  function describeFound(found) {
+    return found ? "\"" + literalEscape(found) + "\"" : "end of input";
   }
-}
+
+  return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
+};
 
 function peg$parse(input, options) {
   options = options !== undefined ? options : {};
 
-  const peg$FAILED = {};
-  const peg$source = options.grammarSource;
+  var peg$FAILED = {};
+  var peg$source = options.grammarSource;
+
+  var peg$startRuleFunctions = { query: peg$parsequery };
+  var peg$startRuleFunction = peg$parsequery;
+
+  var peg$c0 = "-";
+  var peg$c1 = "report-field";
+  var peg$c2 = "reportfield";
+  var peg$c3 = ",";
+  var peg$c4 = "date";
+  var peg$c5 = "amount";
+  var peg$c6 = "merchant";
+  var peg$c7 = "description";
+  var peg$c8 = "reportid";
+  var peg$c9 = "report-id";
+  var peg$c10 = "keyword";
+  var peg$c11 = "in";
+  var peg$c12 = "currency";
+  var peg$c13 = "groupCurrency";
+  var peg$c14 = "group-currency";
+  var peg$c15 = "tag";
+  var peg$c16 = "category";
+  var peg$c17 = "to";
+  var peg$c18 = "exporter";
+  var peg$c19 = "payer";
+  var peg$c20 = "taxrate";
+  var peg$c21 = "tax-rate";
+  var peg$c22 = "cardID";
+  var peg$c23 = "card";
+  var peg$c24 = "from";
+  var peg$c25 = "attendee";
+  var peg$c26 = "expenseType";
+  var peg$c27 = "expense-type";
+  var peg$c28 = "withdrawalType";
+  var peg$c29 = "withdrawal-type";
+  var peg$c30 = "withdrawalid";
+  var peg$c31 = "withdrawal-id";
+  var peg$c32 = "billable";
+  var peg$c33 = "reimbursable";
+  var peg$c34 = "type";
+  var peg$c35 = "status";
+  var peg$c36 = "sortBy";
+  var peg$c37 = "sort-by";
+  var peg$c38 = "sortOrder";
+  var peg$c39 = "sort-order";
+  var peg$c40 = "policyID";
+  var peg$c41 = "workspace";
+  var peg$c42 = "submitted";
+  var peg$c43 = "approved";
+  var peg$c44 = "paid";
+  var peg$c45 = "exported";
+  var peg$c46 = "posted";
+  var peg$c47 = "withdrawn";
+  var peg$c48 = "groupby";
+  var peg$c49 = "group-by";
+  var peg$c50 = "limit";
+  var peg$c51 = "feed";
+  var peg$c52 = "title";
+  var peg$c53 = "assignee";
+  var peg$c54 = "createdby";
+  var peg$c55 = "created-by";
+  var peg$c56 = "action";
+  var peg$c57 = "total";
+  var peg$c58 = "has";
+  var peg$c59 = "is";
+  var peg$c60 = "purchaseamount";
+  var peg$c61 = "purchase-amount";
+  var peg$c62 = "purchasecurrency";
+  var peg$c63 = "purchase-currency";
+  var peg$c64 = "columns";
+  var peg$c65 = "view";
+  var peg$c66 = "per-diem";
+  var peg$c67 = "drafts";
+  var peg$c68 = "draft";
+  var peg$c69 = "original-amount";
+  var peg$c70 = "tax";
+  var peg$c71 = "policy-name";
+  var peg$c72 = "bank-account";
+  var peg$c73 = "long-report-id";
+  var peg$c74 = "exported-to";
+  var peg$c75 = "exportedto";
+  var peg$c76 = "exchange-rate";
+  var peg$c77 = "reimbursable-total";
+  var peg$c78 = "non-reimbursable-total";
+  var peg$c79 = "group-from";
+  var peg$c80 = "group-expenses";
+  var peg$c81 = "group-total";
+  var peg$c82 = "group-card";
+  var peg$c83 = "group-feed";
+  var peg$c84 = "group-bank-account";
+  var peg$c85 = "group-withdrawn";
+  var peg$c86 = "group-withdrawal-id";
+  var peg$c87 = "group-category";
+  var peg$c88 = "group-tag";
+  var peg$c89 = "group-merchant";
+  var peg$c90 = "group-month";
+  var peg$c91 = "group-week";
+  var peg$c92 = "group-year";
+  var peg$c93 = "group-quarter";
+  var peg$c94 = "*:";
+  var peg$c95 = "!=";
+  var peg$c96 = ">=";
+  var peg$c97 = ">";
+  var peg$c98 = "<=";
+  var peg$c99 = "<";
+  var peg$c100 = "\u201C";
+  var peg$c101 = "\u201D";
+  var peg$c102 = "\"";
+
+  var peg$r0 = /^[ \t\r\n\xA0,:=<>!]/;
+  var peg$r1 = /^[:=]/;
+  var peg$r2 = /^[^ ,\t\n\r\xA0]/;
+  var peg$r3 = /^[ \t\r\n\xA0]/;
+  var peg$r4 = /^[^ ,"\u201D\u201C\t\n\r\xA0]/;
+  var peg$r5 = /^["\u201C-\u201D]/;
+  var peg$r6 = /^[^"\u201D\u201C\r\n]/;
+  var peg$r7 = /^[ \t\n\r\xA0a-zA-Z0-9]/;
+  var peg$r8 = /^[a-zA-Z0-9]/;
+  var peg$r9 = /^[ \t\n\r\xA0]/;
+  var peg$r10 = /^[ \t\n\r\xA0a-zA-Z]/;
+  var peg$r11 = /^[,]/;
+  var peg$r12 = /^[ \t\n\r\xA0,]/;
+
+  var peg$e0 = peg$literalExpectation("-", false);
+  var peg$e1 = peg$literalExpectation("report-field", true);
+  var peg$e2 = peg$literalExpectation("reportfield", true);
+  var peg$e3 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0", ",", ":", "=", "<", ">", "!"], false, false);
+  var peg$e4 = peg$anyExpectation();
+  var peg$e5 = peg$literalExpectation(",", false);
+  var peg$e6 = peg$otherExpectation("key");
+  var peg$e7 = peg$literalExpectation("date", true);
+  var peg$e8 = peg$literalExpectation("amount", true);
+  var peg$e9 = peg$literalExpectation("merchant", true);
+  var peg$e10 = peg$literalExpectation("description", true);
+  var peg$e11 = peg$literalExpectation("reportid", true);
+  var peg$e12 = peg$literalExpectation("report-id", true);
+  var peg$e13 = peg$literalExpectation("keyword", true);
+  var peg$e14 = peg$literalExpectation("in", true);
+  var peg$e15 = peg$literalExpectation("currency", true);
+  var peg$e16 = peg$literalExpectation("groupCurrency", false);
+  var peg$e17 = peg$literalExpectation("group-currency", true);
+  var peg$e18 = peg$literalExpectation("tag", true);
+  var peg$e19 = peg$literalExpectation("category", true);
+  var peg$e20 = peg$literalExpectation("to", true);
+  var peg$e21 = peg$literalExpectation("exporter", true);
+  var peg$e22 = peg$literalExpectation("payer", true);
+  var peg$e23 = peg$literalExpectation("taxRate", true);
+  var peg$e24 = peg$literalExpectation("tax-rate", true);
+  var peg$e25 = peg$literalExpectation("cardID", false);
+  var peg$e26 = peg$literalExpectation("card", true);
+  var peg$e27 = peg$literalExpectation("from", true);
+  var peg$e28 = peg$literalExpectation("attendee", true);
+  var peg$e29 = peg$literalExpectation("expenseType", false);
+  var peg$e30 = peg$literalExpectation("expense-type", true);
+  var peg$e31 = peg$literalExpectation("withdrawalType", false);
+  var peg$e32 = peg$literalExpectation("withdrawal-type", true);
+  var peg$e33 = peg$literalExpectation("withdrawalID", true);
+  var peg$e34 = peg$literalExpectation("withdrawal-id", true);
+  var peg$e35 = peg$literalExpectation("billable", true);
+  var peg$e36 = peg$literalExpectation("reimbursable", true);
+  var peg$e37 = peg$literalExpectation("type", true);
+  var peg$e38 = peg$literalExpectation("status", true);
+  var peg$e39 = peg$literalExpectation("sortBy", false);
+  var peg$e40 = peg$literalExpectation("sort-by", true);
+  var peg$e41 = peg$literalExpectation("sortOrder", false);
+  var peg$e42 = peg$literalExpectation("sort-order", true);
+  var peg$e43 = peg$literalExpectation("policyID", false);
+  var peg$e44 = peg$literalExpectation("workspace", true);
+  var peg$e45 = peg$literalExpectation("submitted", true);
+  var peg$e46 = peg$literalExpectation("approved", true);
+  var peg$e47 = peg$literalExpectation("paid", true);
+  var peg$e48 = peg$literalExpectation("exported", true);
+  var peg$e49 = peg$literalExpectation("posted", true);
+  var peg$e50 = peg$literalExpectation("withdrawn", true);
+  var peg$e51 = peg$literalExpectation("groupBy", true);
+  var peg$e52 = peg$literalExpectation("group-by", true);
+  var peg$e53 = peg$literalExpectation("limit", true);
+  var peg$e54 = peg$literalExpectation("feed", true);
+  var peg$e55 = peg$literalExpectation("title", true);
+  var peg$e56 = peg$literalExpectation("assignee", true);
+  var peg$e57 = peg$literalExpectation("createdBy", true);
+  var peg$e58 = peg$literalExpectation("created-by", true);
+  var peg$e59 = peg$literalExpectation("action", true);
+  var peg$e60 = peg$literalExpectation("total", true);
+  var peg$e61 = peg$literalExpectation("has", true);
+  var peg$e62 = peg$literalExpectation("is", true);
+  var peg$e63 = peg$literalExpectation("purchaseAmount", true);
+  var peg$e64 = peg$literalExpectation("purchase-amount", true);
+  var peg$e65 = peg$literalExpectation("purchaseCurrency", true);
+  var peg$e66 = peg$literalExpectation("purchase-currency", true);
+  var peg$e67 = peg$literalExpectation("columns", true);
+  var peg$e68 = peg$literalExpectation("view", true);
+  var peg$e69 = peg$literalExpectation("per-diem", true);
+  var peg$e70 = peg$literalExpectation("drafts", true);
+  var peg$e71 = peg$literalExpectation("draft", true);
+  var peg$e72 = peg$literalExpectation("original-amount", true);
+  var peg$e73 = peg$literalExpectation("tax", true);
+  var peg$e74 = peg$literalExpectation("policy-name", true);
+  var peg$e75 = peg$literalExpectation("bank-account", true);
+  var peg$e76 = peg$literalExpectation("long-report-id", true);
+  var peg$e77 = peg$literalExpectation("exported-to", true);
+  var peg$e78 = peg$classExpectation([":", "="], false, false);
+  var peg$e79 = peg$literalExpectation("exportedTo", true);
+  var peg$e80 = peg$literalExpectation("exchange-rate", true);
+  var peg$e81 = peg$literalExpectation("reimbursable-total", true);
+  var peg$e82 = peg$literalExpectation("non-reimbursable-total", true);
+  var peg$e83 = peg$literalExpectation("group-from", true);
+  var peg$e84 = peg$literalExpectation("group-expenses", true);
+  var peg$e85 = peg$literalExpectation("group-total", true);
+  var peg$e86 = peg$literalExpectation("group-card", true);
+  var peg$e87 = peg$literalExpectation("group-feed", true);
+  var peg$e88 = peg$literalExpectation("group-bank-account", true);
+  var peg$e89 = peg$literalExpectation("group-withdrawn", true);
+  var peg$e90 = peg$literalExpectation("group-withdrawal-id", true);
+  var peg$e91 = peg$literalExpectation("group-category", true);
+  var peg$e92 = peg$literalExpectation("group-tag", true);
+  var peg$e93 = peg$literalExpectation("group-merchant", true);
+  var peg$e94 = peg$literalExpectation("group-month", true);
+  var peg$e95 = peg$literalExpectation("group-week", true);
+  var peg$e96 = peg$literalExpectation("group-year", true);
+  var peg$e97 = peg$literalExpectation("group-quarter", true);
+  var peg$e98 = peg$otherExpectation("operator");
+  var peg$e99 = peg$literalExpectation("*:", false);
+  var peg$e100 = peg$literalExpectation("!=", false);
+  var peg$e101 = peg$literalExpectation(">=", false);
+  var peg$e102 = peg$literalExpectation(">", false);
+  var peg$e103 = peg$literalExpectation("<=", false);
+  var peg$e104 = peg$literalExpectation("<", false);
+  var peg$e105 = peg$otherExpectation("word");
+  var peg$e106 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e107 = peg$otherExpectation("whitespace");
+  var peg$e108 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
+  var peg$e109 = peg$otherExpectation("quote");
+  var peg$e110 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e111 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
+  var peg$e112 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
+  var peg$e113 = peg$literalExpectation("\u201C", false);
+  var peg$e114 = peg$literalExpectation("\u201D", false);
+  var peg$e115 = peg$literalExpectation("\"", false);
+  var peg$e116 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e117 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e118 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
+  var peg$e119 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
+  var peg$e120 = peg$classExpectation([","], false, false);
+  var peg$e121 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false);
+
+  var peg$f0 = function(ranges) { return { autocomplete, ranges }; };
+  var peg$f1 = function(filters) { return filters.filter(Boolean).flat(); };
+  var peg$f2 = function(neg, key, op, value) {
+      expectingNestedQuote = false; nameOperator = false; // Reset string parser
+
+      const isNegated = !!neg && !nonNegatableKeys.has(key);
+
+      if (!value) {
+        autocomplete = {
+          key,
+          negated: isNegated,
+          value: "",
+          start: location().end.offset,
+          length: 0,
+        };
+        return;
+      }
 
-  const peg$startRuleFunctions = {
-    query: peg$parsequery,
-  };
-  let peg$startRuleFunction = peg$parsequery;
-
-  const peg$c0 = "-";
-  const peg$c1 = "report-field";
-  const peg$c2 = "reportfield";
-  const peg$c3 = ",";
-  const peg$c4 = "date";
-  const peg$c5 = "amount";
-  const peg$c6 = "merchant";
-  const peg$c7 = "description";
-  const peg$c8 = "reportid";
-  const peg$c9 = "report-id";
-  const peg$c10 = "in";
-  const peg$c11 = "currency";
-  const peg$c12 = "groupCurrency";
-  const peg$c13 = "group-currency";
-  const peg$c14 = "tag";
-  const peg$c15 = "category";
-  const peg$c16 = "to";
-  const peg$c17 = "exporter";
-  const peg$c18 = "payer";
-  const peg$c19 = "taxrate";
-  const peg$c20 = "tax-rate";
-  const peg$c21 = "cardID";
-  const peg$c22 = "card";
-  const peg$c23 = "from";
-  const peg$c24 = "attendee";
-  const peg$c25 = "expenseType";
-  const peg$c26 = "expense-type";
-  const peg$c27 = "withdrawalType";
-  const peg$c28 = "withdrawal-type";
-  const peg$c29 = "withdrawalid";
-  const peg$c30 = "withdrawal-id";
-  const peg$c31 = "billable";
-  const peg$c32 = "reimbursable";
-  const peg$c33 = "type";
-  const peg$c34 = "status";
-  const peg$c35 = "policyID";
-  const peg$c36 = "workspace";
-  const peg$c37 = "submitted";
-  const peg$c38 = "approved";
-  const peg$c39 = "paid";
-  const peg$c40 = "exported";
-  const peg$c41 = "posted";
-  const peg$c42 = "withdrawn";
-  const peg$c43 = "groupby";
-  const peg$c44 = "group-by";
-  const peg$c45 = "limit";
-  const peg$c46 = "feed";
-  const peg$c47 = "title";
-  const peg$c48 = "assignee";
-  const peg$c49 = "createdby";
-  const peg$c50 = "created-by";
-  const peg$c51 = "action";
-  const peg$c52 = "total";
-  const peg$c53 = "has";
-  const peg$c54 = "is";
-  const peg$c55 = "purchaseamount";
-  const peg$c56 = "purchase-amount";
-  const peg$c57 = "purchasecurrency";
-  const peg$c58 = "purchase-currency";
-  const peg$c59 = "columns";
-  const peg$c60 = "view";
-  const peg$c61 = "exportedto";
-  const peg$c62 = "exported-to";
-  const peg$c63 = "*:";
-  const peg$c64 = "!=";
-  const peg$c65 = ">=";
-  const peg$c66 = ">";
-  const peg$c67 = "<=";
-  const peg$c68 = "<";
-  const peg$c69 = "\u201C";
-  const peg$c70 = "\u201D";
-  const peg$c71 = "\"";
-
-  const peg$r0 = /^[ \t\r\n\xA0,:=<>!]/;
-  const peg$r1 = /^[:=]/;
-  const peg$r2 = /^[^ ,\t\n\r\xA0]/;
-  const peg$r3 = /^[ \t\r\n\xA0]/;
-  const peg$r4 = /^[^ ,"\u201D\u201C\t\n\r\xA0]/;
-  const peg$r5 = /^["\u201C-\u201D]/;
-  const peg$r6 = /^[^"\u201D\u201C\r\n]/;
-  const peg$r7 = /^[ \t\n\r\xA0a-zA-Z0-9]/;
-  const peg$r8 = /^[a-zA-Z0-9]/;
-  const peg$r9 = /^[ \t\n\r\xA0]/;
-  const peg$r10 = /^[ \t\n\r\xA0a-zA-Z]/;
-  const peg$r11 = /^[,]/;
-  const peg$r12 = /^[ \t\n\r\xA0,]/;
-
-  const peg$e0 = peg$literalExpectation("-", false);
-  const peg$e1 = peg$literalExpectation("report-field", true);
-  const peg$e2 = peg$literalExpectation("reportfield", true);
-  const peg$e3 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0", ",", ":", "=", "<", ">", "!"], false, false, false);
-  const peg$e4 = peg$anyExpectation();
-  const peg$e5 = peg$literalExpectation(",", false);
-  const peg$e6 = peg$otherExpectation("key");
-  const peg$e7 = peg$literalExpectation("date", true);
-  const peg$e8 = peg$literalExpectation("amount", true);
-  const peg$e9 = peg$literalExpectation("merchant", true);
-  const peg$e10 = peg$literalExpectation("description", true);
-  const peg$e11 = peg$literalExpectation("reportid", true);
-  const peg$e12 = peg$literalExpectation("report-id", true);
-  const peg$e13 = peg$literalExpectation("in", true);
-  const peg$e14 = peg$literalExpectation("currency", true);
-  const peg$e15 = peg$literalExpectation("groupCurrency", false);
-  const peg$e16 = peg$literalExpectation("group-currency", true);
-  const peg$e17 = peg$literalExpectation("tag", true);
-  const peg$e18 = peg$literalExpectation("category", true);
-  const peg$e19 = peg$literalExpectation("to", true);
-  const peg$e20 = peg$literalExpectation("exporter", true);
-  const peg$e21 = peg$literalExpectation("payer", true);
-  const peg$e22 = peg$literalExpectation("taxRate", true);
-  const peg$e23 = peg$literalExpectation("tax-rate", true);
-  const peg$e24 = peg$literalExpectation("cardID", false);
-  const peg$e25 = peg$literalExpectation("card", true);
-  const peg$e26 = peg$literalExpectation("from", true);
-  const peg$e27 = peg$literalExpectation("attendee", true);
-  const peg$e28 = peg$literalExpectation("expenseType", false);
-  const peg$e29 = peg$literalExpectation("expense-type", true);
-  const peg$e30 = peg$literalExpectation("withdrawalType", false);
-  const peg$e31 = peg$literalExpectation("withdrawal-type", true);
-  const peg$e32 = peg$literalExpectation("withdrawalID", true);
-  const peg$e33 = peg$literalExpectation("withdrawal-id", true);
-  const peg$e34 = peg$literalExpectation("billable", true);
-  const peg$e35 = peg$literalExpectation("reimbursable", true);
-  const peg$e36 = peg$literalExpectation("type", true);
-  const peg$e37 = peg$literalExpectation("status", true);
-  const peg$e38 = peg$literalExpectation("policyID", false);
-  const peg$e39 = peg$literalExpectation("workspace", true);
-  const peg$e40 = peg$literalExpectation("submitted", true);
-  const peg$e41 = peg$literalExpectation("approved", true);
-  const peg$e42 = peg$literalExpectation("paid", true);
-  const peg$e43 = peg$literalExpectation("exported", true);
-  const peg$e44 = peg$literalExpectation("posted", true);
-  const peg$e45 = peg$literalExpectation("withdrawn", true);
-  const peg$e46 = peg$literalExpectation("groupBy", true);
-  const peg$e47 = peg$literalExpectation("group-by", true);
-  const peg$e48 = peg$literalExpectation("limit", true);
-  const peg$e49 = peg$literalExpectation("feed", true);
-  const peg$e50 = peg$literalExpectation("title", true);
-  const peg$e51 = peg$literalExpectation("assignee", true);
-  const peg$e52 = peg$literalExpectation("createdBy", true);
-  const peg$e53 = peg$literalExpectation("created-by", true);
-  const peg$e54 = peg$literalExpectation("action", true);
-  const peg$e55 = peg$literalExpectation("total", true);
-  const peg$e56 = peg$literalExpectation("has", true);
-  const peg$e57 = peg$literalExpectation("is", true);
-  const peg$e58 = peg$literalExpectation("purchaseAmount", true);
-  const peg$e59 = peg$literalExpectation("purchase-amount", true);
-  const peg$e60 = peg$literalExpectation("purchaseCurrency", true);
-  const peg$e61 = peg$literalExpectation("purchase-currency", true);
-  const peg$e62 = peg$literalExpectation("columns", true);
-  const peg$e63 = peg$literalExpectation("view", true);
-  const peg$e64 = peg$classExpectation([":", "="], false, false, false);
-  const peg$e65 = peg$literalExpectation("exportedTo", true);
-  const peg$e66 = peg$literalExpectation("exported-to", true);
-  const peg$e67 = peg$otherExpectation("operator");
-  const peg$e68 = peg$literalExpectation("*:", false);
-  const peg$e69 = peg$literalExpectation("!=", false);
-  const peg$e70 = peg$literalExpectation(">=", false);
-  const peg$e71 = peg$literalExpectation(">", false);
-  const peg$e72 = peg$literalExpectation("<=", false);
-  const peg$e73 = peg$literalExpectation("<", false);
-  const peg$e74 = peg$otherExpectation("word");
-  const peg$e75 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false, false);
-  const peg$e76 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false, false);
-  const peg$e77 = peg$otherExpectation("quote");
-  const peg$e78 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false, false);
-  const peg$e79 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false, false);
-  const peg$e80 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false, false);
-  const peg$e81 = peg$literalExpectation("\u201C", false);
-  const peg$e82 = peg$literalExpectation("\u201D", false);
-  const peg$e83 = peg$literalExpectation("\"", false);
-  const peg$e84 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false, false);
-  const peg$e85 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false, false);
-  const peg$e86 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false, false);
-  const peg$e87 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false, false);
-  const peg$e88 = peg$classExpectation([","], false, false, false);
-  const peg$e89 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false, false);
-
-  function peg$f0(ranges) {    return { autocomplete, ranges };  }
-  function peg$f1(filters) {    return filters.filter(Boolean).flat();  }
-  function peg$f2(neg, key, op, value) {
-    expectingNestedQuote = false; nameOperator = false; // Reset string parser
-
-    const isNegated = !!neg && !nonNegatableKeys.has(key);
-
-    if (!value) {
       autocomplete = {
         key,
         negated: isNegated,
-        value: "",
-        start: location().end.offset,
-        length: 0,
+        ...value[value.length - 1],
       };
-      return;
-    }
-
-    autocomplete = {
-      key,
-      negated: isNegated,
-      ...value[value.length - 1],
+      return value
+        .filter((v) => v.length > 0)
+        .map((v) => ({
+          key,
+          negated: isNegated,
+          ...v,
+        }));
     };
-    return value
-      .filter((v) => v.length > 0)
-      .map((v) => ({
-        key,
-        negated: isNegated,
-        ...v,
-      }));
-  }
-  function peg$f3(rest) {
-    const suffix = rest.replaceAll(/^-+/g, "");
-    return "reportField-" + (suffix ? suffix : "");
-  }
-  function peg$f4() {    autocomplete = null;  }
-  function peg$f5(k) {
-    nameOperator = (k === "from" || k === "to" || k === "payer" || k === "exporter" || k === "attendee" || k === "createdBy" || k === "assignee");
-    return k;
-  }
-  function peg$f6(parts, empty) {
-    const ends = location();
-    const value = parts.flat().filter(Boolean); // Filter out undefined values returned by the predicate
-    if (empty) {
-      value.push("");
-    }
-    let count = ends.start.offset;
-    const result = [];
-    value.forEach((filter) => {
-      let word = filter;
-      if (word.startsWith('"') && word.endsWith('"') && word.length >= 2) {
-        word = word.slice(1, -1);
-      }
-      result.push({
-        value: word,
-        start: count,
-        length: filter.length,
+  var peg$f3 = function(rest) {
+      const suffix = rest.replaceAll(/^-+/g, "");
+      return "reportField-" + (suffix ? suffix : "");
+    };
+  var peg$f4 = function() { autocomplete = null; };
+  var peg$f5 = function(k) {
+      nameOperator = (k === "from" || k === "to" || k === "payer" || k === "exporter" || k === "attendee" || k === "createdBy" || k === "assignee");
+      return k;
+    };
+  var peg$f6 = function(parts, empty) {
+      const ends = location();
+      const value = parts.flat().filter(Boolean); // Filter out undefined values returned by the predicate
+      if (empty) {
+        value.push("");
+      }
+      let count = ends.start.offset;
+      const result = [];
+      value.forEach((filter) => {
+        let word = filter;
+        if (word.startsWith('"') && word.endsWith('"') && word.length >= 2) {
+          word = word.slice(1, -1);
+        }
+        result.push({
+          value: word,
+          start: count,
+          length: filter.length,
+        });
+        count += filter.length + 1;
       });
-      count += filter.length + 1;
-    });
-    return result;
-  }
-  function peg$f7() {    return "date";  }
-  function peg$f8() {    return "amount";  }
-  function peg$f9() {    return "merchant";  }
-  function peg$f10() {    return "description";  }
-  function peg$f11() {    return "reportID";  }
-  function peg$f12() {    return "in";  }
-  function peg$f13() {    return "currency";  }
-  function peg$f14() {    return "groupCurrency";  }
-  function peg$f15() {    return "tag";  }
-  function peg$f16() {    return "category";  }
-  function peg$f17() {    return "to";  }
-  function peg$f18() {    return "exporter";  }
-  function peg$f19() {    return "payer";  }
-  function peg$f20() {    return "taxRate";  }
-  function peg$f21() {    return "cardID";  }
-  function peg$f22() {    return "from";  }
-  function peg$f23() {return "attendee"  }
-  function peg$f24() {    return "expenseType";  }
-  function peg$f25() {    return "withdrawalType";  }
-  function peg$f26() {    return "withdrawalID";  }
-  function peg$f27() {    return "billable";  }
-  function peg$f28() {    return "reimbursable";  }
-  function peg$f29() {    return "type";  }
-  function peg$f30() {    return "status";  }
-  function peg$f31() {    return "policyID";  }
-  function peg$f32() {    return "submitted";  }
-  function peg$f33() {    return "approved";  }
-  function peg$f34() {    return "paid";  }
-  function peg$f35() {    return "exported";  }
-  function peg$f36() {    return "posted";  }
-  function peg$f37() {    return "withdrawn";  }
-  function peg$f38() {    return "groupBy";  }
-  function peg$f39() {    return "limit";  }
-  function peg$f40() {    return "feed";  }
-  function peg$f41() {    return "title";  }
-  function peg$f42() {    return "assignee";  }
-  function peg$f43() {    return "createdBy";  }
-  function peg$f44() {    return "action";  }
-  function peg$f45() {return "total";  }
-  function peg$f46() {return "has";  }
-  function peg$f47() {return "is";  }
-  function peg$f48() {return "purchaseAmount"  }
-  function peg$f49() {return "purchaseCurrency"  }
-  function peg$f50() {
-    isColumnsContext = true;
-    return "columns";
-  }
-  function peg$f51() {return "view"  }
-  function peg$f52() {    return "exportedTo";  }
-  function peg$f53() {    return "exportedTo";  }
-  function peg$f54() {    return "contains";  }
-  function peg$f55() {    return "eq";  }
-  function peg$f56() {    return "neq";  }
-  function peg$f57() {    return "gte";  }
-  function peg$f58() {    return "gt";  }
-  function peg$f59() {    return "lte";  }
-  function peg$f60() {    return "lt";  }
-  function peg$f61(o) {
-    if (nameOperator) {
-      expectingNestedQuote = (o === "eq" || o === "contains");
-    }
-    isColumnsContext = false;
-    return o;
-  }
-  function peg$f62(chars) {    return chars.join("").trim();  }
-  function peg$f63() {    
-     isColumnsContext = false;
-     return "and";
-  }
-  function peg$f64() {    return expectingNestedQuote;  }
-  function peg$f65(start, inner, end) {    //handle no-breaking space
-         return [...start, '"', ...inner, '"', ...end].join("");
-  }
-  function peg$f66(start) {return "“"  }
-  function peg$f67(start) {return "”"  }
-  function peg$f68(start) {return "\""  }
-  function peg$f69(start, inner, end) {
+      return result;
+    };
+  var peg$f7 = function() { return "date"; };
+  var peg$f8 = function() { return "amount"; };
+  var peg$f9 = function() { return "merchant"; };
+  var peg$f10 = function() { return "description"; };
+  var peg$f11 = function() { return "reportID"; };
+  var peg$f12 = function() { return "keyword"; };
+  var peg$f13 = function() { return "in"; };
+  var peg$f14 = function() { return "currency"; };
+  var peg$f15 = function() { return "groupCurrency"; };
+  var peg$f16 = function() { return "tag"; };
+  var peg$f17 = function() { return "category"; };
+  var peg$f18 = function() { return "to"; };
+  var peg$f19 = function() { return "exporter"; };
+  var peg$f20 = function() { return "payer"; };
+  var peg$f21 = function() { return "taxRate"; };
+  var peg$f22 = function() { return "cardID"; };
+  var peg$f23 = function() { return "from"; };
+  var peg$f24 = function() {return "attendee"};
+  var peg$f25 = function() { return "expenseType"; };
+  var peg$f26 = function() { return "withdrawalType"; };
+  var peg$f27 = function() { return "withdrawalID"; };
+  var peg$f28 = function() { return "billable"; };
+  var peg$f29 = function() { return "reimbursable"; };
+  var peg$f30 = function() { return "type"; };
+  var peg$f31 = function() { return "status"; };
+  var peg$f32 = function() { return "sortBy"; };
+  var peg$f33 = function() { return "sortOrder"; };
+  var peg$f34 = function() { return "policyID"; };
+  var peg$f35 = function() { return "submitted"; };
+  var peg$f36 = function() { return "approved"; };
+  var peg$f37 = function() { return "paid"; };
+  var peg$f38 = function() { return "exported"; };
+  var peg$f39 = function() { return "posted"; };
+  var peg$f40 = function() { return "withdrawn"; };
+  var peg$f41 = function() { return "groupBy"; };
+  var peg$f42 = function() { return "limit"; };
+  var peg$f43 = function() { return "feed"; };
+  var peg$f44 = function() { return "title"; };
+  var peg$f45 = function() { return "assignee"; };
+  var peg$f46 = function() { return "createdBy"; };
+  var peg$f47 = function() { return "action"; };
+  var peg$f48 = function() {return "total"; };
+  var peg$f49 = function() {return "has"; };
+  var peg$f50 = function() {return "is"; };
+  var peg$f51 = function() {return "purchaseAmount"};
+  var peg$f52 = function() {return "purchaseCurrency"};
+  var peg$f53 = function() {
+  isColumnsContext = true;
+  return "columns";
+};
+  var peg$f54 = function() {return "view"};
+  var peg$f55 = function() { return isColumnsContext; };
+  var peg$f56 = function() { return "perDiem"; };
+  var peg$f57 = function() { return "drafts"; };
+  var peg$f58 = function() { return "originalamount"; };
+  var peg$f59 = function() { return "taxAmount"; };
+  var peg$f60 = function() { return "taxrate"; };
+  var peg$f61 = function() { return "policyname"; };
+  var peg$f62 = function() { return "withdrawalID"; };
+  var peg$f63 = function() { return "bankAccount"; };
+  var peg$f64 = function() { return "reportID"; };
+  var peg$f65 = function() { return "base62ReportID"; };
+  var peg$f66 = function() { return "exportedto"; };
+  var peg$f67 = function() { return "exportedTo"; };
+  var peg$f68 = function() { return "exportedTo"; };
+  var peg$f69 = function() { return "exchangeRate"; };
+  var peg$f70 = function() { return "reimbursableTotal"; };
+  var peg$f71 = function() { return "nonReimbursableTotal"; };
+  var peg$f72 = function() { return "groupFrom"; };
+  var peg$f73 = function() { return "groupExpenses"; };
+  var peg$f74 = function() { return "groupTotal"; };
+  var peg$f75 = function() { return "groupCard"; };
+  var peg$f76 = function() { return "groupFeed"; };
+  var peg$f77 = function() { return "groupBankAccount"; };
+  var peg$f78 = function() { return "groupWithdrawn"; };
+  var peg$f79 = function() { return "groupWithdrawalID"; };
+  var peg$f80 = function() { return "groupCategory"; };
+  var peg$f81 = function() { return "groupTag"; };
+  var peg$f82 = function() { return "groupMerchant"; };
+  var peg$f83 = function() { return "groupmonth"; };
+  var peg$f84 = function() { return "groupweek"; };
+  var peg$f85 = function() { return "groupyear"; };
+  var peg$f86 = function() { return "groupquarter"; };
+  var peg$f87 = function() { return "contains"; };
+  var peg$f88 = function() { return "eq"; };
+  var peg$f89 = function() { return "neq"; };
+  var peg$f90 = function() { return "gte"; };
+  var peg$f91 = function() { return "gt"; };
+  var peg$f92 = function() { return "lte"; };
+  var peg$f93 = function() { return "lt"; };
+  var peg$f94 = function(o) {
+      if (nameOperator) {
+        expectingNestedQuote = (o === "eq" || o === "contains");
+      }
+      isColumnsContext = false;
+      return o;
+  };
+  var peg$f95 = function(chars) { return chars.join("").trim(); };
+  var peg$f96 = function() { 
+  isColumnsContext = false;
+  return "and";
+};
+  var peg$f97 = function() { return expectingNestedQuote; };
+  var peg$f98 = function(start, inner, end) { //handle no-breaking space
+      return [...start, '"', ...inner, '"', ...end].join("");
+    };
+  var peg$f99 = function(start) {return "“"};
+  var peg$f100 = function(start) {return "”"};
+  var peg$f101 = function(start) {return "\""};
+  var peg$f102 = function(start, inner, end) {
     return [...start, '"', ...inner, '"'].join("");
-  }
-  let peg$currPos = options.peg$currPos | 0;
-  let peg$savedPos = peg$currPos;
-  const peg$posDetailsCache = [{ line: 1, column: 1 }];
-  let peg$maxFailPos = peg$currPos;
-  let peg$maxFailExpected = options.peg$maxFailExpected || [];
-  let peg$silentFails = options.peg$silentFails | 0;
+};
+  var peg$currPos = options.peg$currPos | 0;
+  var peg$savedPos = peg$currPos;
+  var peg$posDetailsCache = [{ line: 1, column: 1 }];
+  var peg$maxFailPos = peg$currPos;
+  var peg$maxFailExpected = options.peg$maxFailExpected || [];
+  var peg$silentFails = options.peg$silentFails | 0;
 
-  let peg$result;
+  var peg$result;
 
   if (options.startRule) {
     if (!(options.startRule in peg$startRuleFunctions)) {
@@ -519,7 +627,7 @@ function peg$parse(input, options) {
     return {
       source: peg$source,
       start: peg$savedPos,
-      end: peg$currPos,
+      end: peg$currPos
     };
   }
 
@@ -547,20 +655,12 @@ function peg$parse(input, options) {
     throw peg$buildSimpleError(message, location);
   }
 
-  function peg$getUnicode(pos = peg$currPos) {
-    const cp = input.codePointAt(pos);
-    if (cp === undefined) {
-      return "";
-    }
-    return String.fromCodePoint(cp);
-  }
-
   function peg$literalExpectation(text, ignoreCase) {
-    return { type: "literal", text, ignoreCase };
+    return { type: "literal", text: text, ignoreCase: ignoreCase };
   }
 
-  function peg$classExpectation(parts, inverted, ignoreCase, unicode) {
-    return { type: "class", parts, inverted, ignoreCase, unicode };
+  function peg$classExpectation(parts, inverted, ignoreCase) {
+    return { type: "class", parts: parts, inverted: inverted, ignoreCase: ignoreCase };
   }
 
   function peg$anyExpectation() {
@@ -572,12 +672,12 @@ function peg$parse(input, options) {
   }
 
   function peg$otherExpectation(description) {
-    return { type: "other", description };
+    return { type: "other", description: description };
   }
 
   function peg$computePosDetails(pos) {
-    let details = peg$posDetailsCache[pos];
-    let p;
+    var details = peg$posDetailsCache[pos];
+    var p;
 
     if (details) {
       return details;
@@ -592,7 +692,7 @@ function peg$parse(input, options) {
       details = peg$posDetailsCache[p];
       details = {
         line: details.line,
-        column: details.column,
+        column: details.column
       };
 
       while (p < pos) {
@@ -613,21 +713,21 @@ function peg$parse(input, options) {
   }
 
   function peg$computeLocation(startPos, endPos, offset) {
-    const startPosDetails = peg$computePosDetails(startPos);
-    const endPosDetails = peg$computePosDetails(endPos);
+    var startPosDetails = peg$computePosDetails(startPos);
+    var endPosDetails = peg$computePosDetails(endPos);
 
-    const res = {
+    var res = {
       source: peg$source,
       start: {
         offset: startPos,
         line: startPosDetails.line,
-        column: startPosDetails.column,
+        column: startPosDetails.column
       },
       end: {
         offset: endPos,
         line: endPosDetails.line,
-        column: endPosDetails.column,
-      },
+        column: endPosDetails.column
+      }
     };
     if (offset && peg$source && (typeof peg$source.offset === "function")) {
       res.start = peg$source.offset(res.start);
@@ -661,7 +761,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsequery() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -674,7 +774,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterList() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = [];
@@ -699,7 +799,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilter() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parsedefaultFilter();
@@ -717,7 +817,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedefaultFilter() {
-    let s0, s1, s2, s3, s4, s5, s6, s7;
+    var s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -756,12 +856,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportFieldDynamic() {
-    let s0, s1, s2, s3, s4, s5, s6, s7;
+    var s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
     if (s1.toLowerCase() === peg$c1) {
-      peg$currPos += (12);
+      peg$currPos += 12;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e1); }
@@ -769,7 +869,7 @@ function peg$parse(input, options) {
     if (s1 === peg$FAILED) {
       s1 = input.substr(peg$currPos, 11);
       if (s1.toLowerCase() === peg$c2) {
-        peg$currPos += (11);
+        peg$currPos += 11;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e2); }
@@ -877,7 +977,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefreeTextFilter() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -904,7 +1004,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseautocompleteKey() {
-    let s0, s1;
+    var s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -1063,7 +1163,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterKey() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parseautocompleteKey();
@@ -1077,7 +1177,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseidentifier() {
-    let s0, s1, s2, s3, s4;
+    var s0, s1, s2, s3, s4;
 
     s0 = peg$currPos;
     s1 = peg$currPos;
@@ -1139,12 +1239,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedate() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c4) {
-      peg$currPos += (4);
+      peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e7); }
@@ -1159,12 +1259,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseamount() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c5) {
-      peg$currPos += (6);
+      peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e8); }
@@ -1179,12 +1279,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsemerchant() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c6) {
-      peg$currPos += (8);
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e9); }
@@ -1199,12 +1299,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedescription() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c7) {
-      peg$currPos += (11);
+      peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e10); }
@@ -1219,11 +1319,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportID() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = input.substr(peg$currPos, 8);
     if (s0.toLowerCase() === peg$c8) {
-      peg$currPos += (8);
+      peg$currPos += 8;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e11); }
@@ -1232,7 +1332,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 9);
       if (s1.toLowerCase() === peg$c9) {
-        peg$currPos += (9);
+        peg$currPos += 9;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e12); }
@@ -1247,13 +1347,13 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsein() {
-    let s0, s1;
+  function peg$parsekeyword() {
+    var s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 2);
+    s1 = input.substr(peg$currPos, 7);
     if (s1.toLowerCase() === peg$c10) {
-      peg$currPos += (2);
+      peg$currPos += 7;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e13); }
@@ -1267,13 +1367,13 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsecurrency() {
-    let s0, s1;
+  function peg$parsein() {
+    var s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 8);
+    s1 = input.substr(peg$currPos, 2);
     if (s1.toLowerCase() === peg$c11) {
-      peg$currPos += (8);
+      peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e14); }
@@ -1287,28 +1387,48 @@ function peg$parse(input, options) {
     return s0;
   }
 
+  function peg$parsecurrency() {
+    var s0, s1;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 8);
+    if (s1.toLowerCase() === peg$c12) {
+      peg$currPos += 8;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e15); }
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f14();
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
   function peg$parsegroupCurrency() {
-    let s0, s1;
+    var s0, s1;
 
-    if (input.substr(peg$currPos, 13) === peg$c12) {
-      s0 = peg$c12;
+    if (input.substr(peg$currPos, 13) === peg$c13) {
+      s0 = peg$c13;
       peg$currPos += 13;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e15); }
+      if (peg$silentFails === 0) { peg$fail(peg$e16); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 14);
-      if (s1.toLowerCase() === peg$c13) {
-        peg$currPos += (14);
+      if (s1.toLowerCase() === peg$c14) {
+        peg$currPos += 14;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e16); }
+        if (peg$silentFails === 0) { peg$fail(peg$e17); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f14();
+        s1 = peg$f15();
       }
       s0 = s1;
     }
@@ -1317,19 +1437,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetag() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c14) {
-      peg$currPos += (3);
+    if (s1.toLowerCase() === peg$c15) {
+      peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e17); }
+      if (peg$silentFails === 0) { peg$fail(peg$e18); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f15();
+      s1 = peg$f16();
     }
     s0 = s1;
 
@@ -1337,19 +1457,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecategory() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c15) {
-      peg$currPos += (8);
+    if (s1.toLowerCase() === peg$c16) {
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e18); }
+      if (peg$silentFails === 0) { peg$fail(peg$e19); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f16();
+      s1 = peg$f17();
     }
     s0 = s1;
 
@@ -1357,19 +1477,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseto() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
-    if (s1.toLowerCase() === peg$c16) {
-      peg$currPos += (2);
+    if (s1.toLowerCase() === peg$c17) {
+      peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e19); }
+      if (peg$silentFails === 0) { peg$fail(peg$e20); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f17();
+      s1 = peg$f18();
     }
     s0 = s1;
 
@@ -1377,19 +1497,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexporter() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c17) {
-      peg$currPos += (8);
+    if (s1.toLowerCase() === peg$c18) {
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e20); }
+      if (peg$silentFails === 0) { peg$fail(peg$e21); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f18();
+      s1 = peg$f19();
     }
     s0 = s1;
 
@@ -1397,19 +1517,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepayer() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c18) {
-      peg$currPos += (5);
+    if (s1.toLowerCase() === peg$c19) {
+      peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e21); }
+      if (peg$silentFails === 0) { peg$fail(peg$e22); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f19();
+      s1 = peg$f20();
     }
     s0 = s1;
 
@@ -1417,27 +1537,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetaxRate() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
-    if (s0.toLowerCase() === peg$c19) {
-      peg$currPos += (7);
+    if (s0.toLowerCase() === peg$c20) {
+      peg$currPos += 7;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e22); }
+      if (peg$silentFails === 0) { peg$fail(peg$e23); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
-      if (s1.toLowerCase() === peg$c20) {
-        peg$currPos += (8);
+      if (s1.toLowerCase() === peg$c21) {
+        peg$currPos += 8;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e23); }
+        if (peg$silentFails === 0) { peg$fail(peg$e24); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f20();
+        s1 = peg$f21();
       }
       s0 = s1;
     }
@@ -1446,27 +1566,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecardID() {
-    let s0, s1;
+    var s0, s1;
 
-    if (input.substr(peg$currPos, 6) === peg$c21) {
-      s0 = peg$c21;
+    if (input.substr(peg$currPos, 6) === peg$c22) {
+      s0 = peg$c22;
       peg$currPos += 6;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e24); }
+      if (peg$silentFails === 0) { peg$fail(peg$e25); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 4);
-      if (s1.toLowerCase() === peg$c22) {
-        peg$currPos += (4);
+      if (s1.toLowerCase() === peg$c23) {
+        peg$currPos += 4;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e25); }
+        if (peg$silentFails === 0) { peg$fail(peg$e26); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f21();
+        s1 = peg$f22();
       }
       s0 = s1;
     }
@@ -1475,19 +1595,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefrom() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c23) {
-      peg$currPos += (4);
+    if (s1.toLowerCase() === peg$c24) {
+      peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e26); }
+      if (peg$silentFails === 0) { peg$fail(peg$e27); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f22();
+      s1 = peg$f23();
     }
     s0 = s1;
 
@@ -1495,19 +1615,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseattendee() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c24) {
-      peg$currPos += (8);
+    if (s1.toLowerCase() === peg$c25) {
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e27); }
+      if (peg$silentFails === 0) { peg$fail(peg$e28); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f23();
+      s1 = peg$f24();
     }
     s0 = s1;
 
@@ -1515,27 +1635,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexpenseType() {
-    let s0, s1;
+    var s0, s1;
 
-    if (input.substr(peg$currPos, 11) === peg$c25) {
-      s0 = peg$c25;
+    if (input.substr(peg$currPos, 11) === peg$c26) {
+      s0 = peg$c26;
       peg$currPos += 11;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e28); }
+      if (peg$silentFails === 0) { peg$fail(peg$e29); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 12);
-      if (s1.toLowerCase() === peg$c26) {
-        peg$currPos += (12);
+      if (s1.toLowerCase() === peg$c27) {
+        peg$currPos += 12;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e29); }
+        if (peg$silentFails === 0) { peg$fail(peg$e30); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f24();
+        s1 = peg$f25();
       }
       s0 = s1;
     }
@@ -1544,27 +1664,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalType() {
-    let s0, s1;
+    var s0, s1;
 
-    if (input.substr(peg$currPos, 14) === peg$c27) {
-      s0 = peg$c27;
+    if (input.substr(peg$currPos, 14) === peg$c28) {
+      s0 = peg$c28;
       peg$currPos += 14;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e30); }
+      if (peg$silentFails === 0) { peg$fail(peg$e31); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 15);
-      if (s1.toLowerCase() === peg$c28) {
-        peg$currPos += (15);
+      if (s1.toLowerCase() === peg$c29) {
+        peg$currPos += 15;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e31); }
+        if (peg$silentFails === 0) { peg$fail(peg$e32); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f25();
+        s1 = peg$f26();
       }
       s0 = s1;
     }
@@ -1573,27 +1693,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalID() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = input.substr(peg$currPos, 12);
-    if (s0.toLowerCase() === peg$c29) {
-      peg$currPos += (12);
+    if (s0.toLowerCase() === peg$c30) {
+      peg$currPos += 12;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e32); }
+      if (peg$silentFails === 0) { peg$fail(peg$e33); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 13);
-      if (s1.toLowerCase() === peg$c30) {
-        peg$currPos += (13);
+      if (s1.toLowerCase() === peg$c31) {
+        peg$currPos += 13;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e33); }
+        if (peg$silentFails === 0) { peg$fail(peg$e34); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f26();
+        s1 = peg$f27();
       }
       s0 = s1;
     }
@@ -1602,19 +1722,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsebillable() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c31) {
-      peg$currPos += (8);
+    if (s1.toLowerCase() === peg$c32) {
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e34); }
+      if (peg$silentFails === 0) { peg$fail(peg$e35); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f27();
+      s1 = peg$f28();
     }
     s0 = s1;
 
@@ -1622,19 +1742,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereimbursable() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
-    if (s1.toLowerCase() === peg$c32) {
-      peg$currPos += (12);
+    if (s1.toLowerCase() === peg$c33) {
+      peg$currPos += 12;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e35); }
+      if (peg$silentFails === 0) { peg$fail(peg$e36); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f28();
+      s1 = peg$f29();
     }
     s0 = s1;
 
@@ -1642,19 +1762,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetype() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c33) {
-      peg$currPos += (4);
+    if (s1.toLowerCase() === peg$c34) {
+      peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e36); }
+      if (peg$silentFails === 0) { peg$fail(peg$e37); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f29();
+      s1 = peg$f30();
     }
     s0 = s1;
 
@@ -1662,47 +1782,105 @@ function peg$parse(input, options) {
   }
 
   function peg$parsestatus() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c34) {
-      peg$currPos += (6);
+    if (s1.toLowerCase() === peg$c35) {
+      peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e37); }
+      if (peg$silentFails === 0) { peg$fail(peg$e38); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f30();
+      s1 = peg$f31();
     }
     s0 = s1;
 
     return s0;
   }
 
+  function peg$parsesortBy() {
+    var s0, s1;
+
+    if (input.substr(peg$currPos, 6) === peg$c36) {
+      s0 = peg$c36;
+      peg$currPos += 6;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e39); }
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 7);
+      if (s1.toLowerCase() === peg$c37) {
+        peg$currPos += 7;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e40); }
+      }
+      if (s1 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s1 = peg$f32();
+      }
+      s0 = s1;
+    }
+
+    return s0;
+  }
+
+  function peg$parsesortOrder() {
+    var s0, s1;
+
+    if (input.substr(peg$currPos, 9) === peg$c38) {
+      s0 = peg$c38;
+      peg$currPos += 9;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e41); }
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 10);
+      if (s1.toLowerCase() === peg$c39) {
+        peg$currPos += 10;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e42); }
+      }
+      if (s1 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s1 = peg$f33();
+      }
+      s0 = s1;
+    }
+
+    return s0;
+  }
+
   function peg$parsepolicyID() {
-    let s0, s1;
+    var s0, s1;
 
-    if (input.substr(peg$currPos, 8) === peg$c35) {
-      s0 = peg$c35;
+    if (input.substr(peg$currPos, 8) === peg$c40) {
+      s0 = peg$c40;
       peg$currPos += 8;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e38); }
+      if (peg$silentFails === 0) { peg$fail(peg$e43); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 9);
-      if (s1.toLowerCase() === peg$c36) {
-        peg$currPos += (9);
+      if (s1.toLowerCase() === peg$c41) {
+        peg$currPos += 9;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e39); }
+        if (peg$silentFails === 0) { peg$fail(peg$e44); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f31();
+        s1 = peg$f34();
       }
       s0 = s1;
     }
@@ -1711,19 +1889,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesubmitted() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c37) {
-      peg$currPos += (9);
+    if (s1.toLowerCase() === peg$c42) {
+      peg$currPos += 9;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e40); }
+      if (peg$silentFails === 0) { peg$fail(peg$e45); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f32();
+      s1 = peg$f35();
     }
     s0 = s1;
 
@@ -1731,19 +1909,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseapproved() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c38) {
-      peg$currPos += (8);
+    if (s1.toLowerCase() === peg$c43) {
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e41); }
+      if (peg$silentFails === 0) { peg$fail(peg$e46); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f33();
+      s1 = peg$f36();
     }
     s0 = s1;
 
@@ -1751,19 +1929,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepaid() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c39) {
-      peg$currPos += (4);
+    if (s1.toLowerCase() === peg$c44) {
+      peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e42); }
+      if (peg$silentFails === 0) { peg$fail(peg$e47); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f34();
+      s1 = peg$f37();
     }
     s0 = s1;
 
@@ -1771,19 +1949,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexported() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c40) {
-      peg$currPos += (8);
+    if (s1.toLowerCase() === peg$c45) {
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e43); }
+      if (peg$silentFails === 0) { peg$fail(peg$e48); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f35();
+      s1 = peg$f38();
     }
     s0 = s1;
 
@@ -1791,19 +1969,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseposted() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c41) {
-      peg$currPos += (6);
+    if (s1.toLowerCase() === peg$c46) {
+      peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e44); }
+      if (peg$silentFails === 0) { peg$fail(peg$e49); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f36();
+      s1 = peg$f39();
     }
     s0 = s1;
 
@@ -1811,19 +1989,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawn() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c42) {
-      peg$currPos += (9);
+    if (s1.toLowerCase() === peg$c47) {
+      peg$currPos += 9;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e45); }
+      if (peg$silentFails === 0) { peg$fail(peg$e50); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f37();
+      s1 = peg$f40();
     }
     s0 = s1;
 
@@ -1831,27 +2009,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupBy() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
-    if (s0.toLowerCase() === peg$c43) {
-      peg$currPos += (7);
+    if (s0.toLowerCase() === peg$c48) {
+      peg$currPos += 7;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e46); }
+      if (peg$silentFails === 0) { peg$fail(peg$e51); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
-      if (s1.toLowerCase() === peg$c44) {
-        peg$currPos += (8);
+      if (s1.toLowerCase() === peg$c49) {
+        peg$currPos += 8;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e47); }
+        if (peg$silentFails === 0) { peg$fail(peg$e52); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f38();
+        s1 = peg$f41();
       }
       s0 = s1;
     }
@@ -1860,19 +2038,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parselimit() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c45) {
-      peg$currPos += (5);
+    if (s1.toLowerCase() === peg$c50) {
+      peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e48); }
+      if (peg$silentFails === 0) { peg$fail(peg$e53); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f39();
+      s1 = peg$f42();
     }
     s0 = s1;
 
@@ -1880,19 +2058,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefeed() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c46) {
-      peg$currPos += (4);
+    if (s1.toLowerCase() === peg$c51) {
+      peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e49); }
+      if (peg$silentFails === 0) { peg$fail(peg$e54); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f40();
+      s1 = peg$f43();
     }
     s0 = s1;
 
@@ -1900,19 +2078,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetitle() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c47) {
-      peg$currPos += (5);
+    if (s1.toLowerCase() === peg$c52) {
+      peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e50); }
+      if (peg$silentFails === 0) { peg$fail(peg$e55); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f41();
+      s1 = peg$f44();
     }
     s0 = s1;
 
@@ -1920,19 +2098,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseassignee() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c48) {
-      peg$currPos += (8);
+    if (s1.toLowerCase() === peg$c53) {
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e51); }
+      if (peg$silentFails === 0) { peg$fail(peg$e56); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f42();
+      s1 = peg$f45();
     }
     s0 = s1;
 
@@ -1940,27 +2118,27 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecreatedBy() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = input.substr(peg$currPos, 9);
-    if (s0.toLowerCase() === peg$c49) {
-      peg$currPos += (9);
+    if (s0.toLowerCase() === peg$c54) {
+      peg$currPos += 9;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e52); }
+      if (peg$silentFails === 0) { peg$fail(peg$e57); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 10);
-      if (s1.toLowerCase() === peg$c50) {
-        peg$currPos += (10);
+      if (s1.toLowerCase() === peg$c55) {
+        peg$currPos += 10;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e53); }
+        if (peg$silentFails === 0) { peg$fail(peg$e58); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f43();
+        s1 = peg$f46();
       }
       s0 = s1;
     }
@@ -1969,19 +2147,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseaction() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c51) {
-      peg$currPos += (6);
+    if (s1.toLowerCase() === peg$c56) {
+      peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e54); }
+      if (peg$silentFails === 0) { peg$fail(peg$e59); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f44();
+      s1 = peg$f47();
     }
     s0 = s1;
 
@@ -1989,204 +2167,1401 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetotal() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c52) {
-      peg$currPos += (5);
+    if (s1.toLowerCase() === peg$c57) {
+      peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e55); }
+      if (peg$silentFails === 0) { peg$fail(peg$e60); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f45();
+      s1 = peg$f48();
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
+  function peg$parsehas() {
+    var s0, s1;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 3);
+    if (s1.toLowerCase() === peg$c58) {
+      peg$currPos += 3;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e61); }
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f49();
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
+  function peg$parseis() {
+    var s0, s1;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 2);
+    if (s1.toLowerCase() === peg$c59) {
+      peg$currPos += 2;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e62); }
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f50();
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
+  function peg$parsepurchaseAmount() {
+    var s0, s1;
+
+    s0 = input.substr(peg$currPos, 14);
+    if (s0.toLowerCase() === peg$c60) {
+      peg$currPos += 14;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e63); }
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 15);
+      if (s1.toLowerCase() === peg$c61) {
+        peg$currPos += 15;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e64); }
+      }
+      if (s1 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s1 = peg$f51();
+      }
+      s0 = s1;
+    }
+
+    return s0;
+  }
+
+  function peg$parsepurchaseCurrency() {
+    var s0, s1;
+
+    s0 = input.substr(peg$currPos, 16);
+    if (s0.toLowerCase() === peg$c62) {
+      peg$currPos += 16;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e65); }
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 17);
+      if (s1.toLowerCase() === peg$c63) {
+        peg$currPos += 17;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e66); }
+      }
+      if (s1 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s1 = peg$f52();
+      }
+      s0 = s1;
+    }
+
+    return s0;
+  }
+
+  function peg$parsecolumns() {
+    var s0, s1;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 7);
+    if (s1.toLowerCase() === peg$c64) {
+      peg$currPos += 7;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e67); }
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f53();
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
+  function peg$parseview() {
+    var s0, s1;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 4);
+    if (s1.toLowerCase() === peg$c65) {
+      peg$currPos += 4;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e68); }
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f54();
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
+  function peg$parsevalues() {
+    var s0, s1, s2;
+
+    s0 = peg$currPos;
+    peg$savedPos = peg$currPos;
+    s1 = peg$f55();
+    if (s1) {
+      s1 = undefined;
+    } else {
+      s1 = peg$FAILED;
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parsecolumnsValues();
+      if (s2 !== peg$FAILED) {
+        s1 = [s1, s2];
+        s0 = s1;
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$parseperDiem();
+      if (s0 === peg$FAILED) {
+        s0 = peg$parsedraft();
+      }
+    }
+
+    return s0;
+  }
+
+  function peg$parsecolumnsValues() {
+    var s0;
+
+    s0 = peg$parseoriginalAmount();
+    if (s0 === peg$FAILED) {
+      s0 = peg$parsetaxRateValue();
+      if (s0 === peg$FAILED) {
+        s0 = peg$parsetaxAmount();
+        if (s0 === peg$FAILED) {
+          s0 = peg$parsepolicyName();
+          if (s0 === peg$FAILED) {
+            s0 = peg$parsewithdrawalId();
+            if (s0 === peg$FAILED) {
+              s0 = peg$parsebankAccount();
+              if (s0 === peg$FAILED) {
+                s0 = peg$parsereportId();
+                if (s0 === peg$FAILED) {
+                  s0 = peg$parsebase62ReportId();
+                  if (s0 === peg$FAILED) {
+                    s0 = peg$parseexportedToColumnValue();
+                    if (s0 === peg$FAILED) {
+                      s0 = peg$parseexchangeRate();
+                      if (s0 === peg$FAILED) {
+                        s0 = peg$parsereimbursableTotal();
+                        if (s0 === peg$FAILED) {
+                          s0 = peg$parsenonReimbursableTotal();
+                          if (s0 === peg$FAILED) {
+                            s0 = peg$parsegroupFrom();
+                            if (s0 === peg$FAILED) {
+                              s0 = peg$parsegroupExpenses();
+                              if (s0 === peg$FAILED) {
+                                s0 = peg$parsegroupTotal();
+                                if (s0 === peg$FAILED) {
+                                  s0 = peg$parsegroupCard();
+                                  if (s0 === peg$FAILED) {
+                                    s0 = peg$parsegroupFeed();
+                                    if (s0 === peg$FAILED) {
+                                      s0 = peg$parsegroupBankAccount();
+                                      if (s0 === peg$FAILED) {
+                                        s0 = peg$parsegroupWithdrawn();
+                                        if (s0 === peg$FAILED) {
+                                          s0 = peg$parsegroupWithdrawalId();
+                                          if (s0 === peg$FAILED) {
+                                            s0 = peg$parsegroupCategory();
+                                            if (s0 === peg$FAILED) {
+                                              s0 = peg$parsegroupTag();
+                                              if (s0 === peg$FAILED) {
+                                                s0 = peg$parsegroupMerchant();
+                                                if (s0 === peg$FAILED) {
+                                                  s0 = peg$parsegroupMonth();
+                                                  if (s0 === peg$FAILED) {
+                                                    s0 = peg$parsegroupWeek();
+                                                    if (s0 === peg$FAILED) {
+                                                      s0 = peg$parsegroupYear();
+                                                      if (s0 === peg$FAILED) {
+                                                        s0 = peg$parsegroupQuarter();
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+
+    return s0;
+  }
+
+  function peg$parseperDiem() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 8);
+    if (s1.toLowerCase() === peg$c66) {
+      peg$currPos += 8;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e69); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f56();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsedraft() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 6);
+    if (s1.toLowerCase() === peg$c67) {
+      peg$currPos += 6;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e70); }
+    }
+    if (s1 === peg$FAILED) {
+      s1 = input.substr(peg$currPos, 5);
+      if (s1.toLowerCase() === peg$c68) {
+        peg$currPos += 5;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e71); }
+      }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f57();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parseoriginalAmount() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 15);
+    if (s1.toLowerCase() === peg$c69) {
+      peg$currPos += 15;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e72); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f58();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsetaxAmount() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 3);
+    if (s1.toLowerCase() === peg$c70) {
+      peg$currPos += 3;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e73); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f59();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsetaxRateValue() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 8);
+    if (s1.toLowerCase() === peg$c21) {
+      peg$currPos += 8;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e24); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f60();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsepolicyName() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 11);
+    if (s1.toLowerCase() === peg$c71) {
+      peg$currPos += 11;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e74); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f61();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsewithdrawalId() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 13);
+    if (s1.toLowerCase() === peg$c31) {
+      peg$currPos += 13;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e34); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f62();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsebankAccount() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 12);
+    if (s1.toLowerCase() === peg$c72) {
+      peg$currPos += 12;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e75); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f63();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsereportId() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 14);
+    if (s1.toLowerCase() === peg$c73) {
+      peg$currPos += 14;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e76); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f64();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsebase62ReportId() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 9);
+    if (s1.toLowerCase() === peg$c9) {
+      peg$currPos += 9;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e12); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f65();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parseexportedToColumnValue() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 11);
+    if (s1.toLowerCase() === peg$c74) {
+      peg$currPos += 11;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e77); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f66();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parseexportedToKeyEnd() {
+    var s0, s1, s2;
+
+    s0 = peg$parsewordBoundary();
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = peg$parse_();
+      s2 = input.charAt(peg$currPos);
+      if (peg$r1.test(s2)) {
+        peg$currPos++;
+      } else {
+        s2 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e78); }
+      }
+      if (s2 !== peg$FAILED) {
+        s1 = [s1, s2];
+        s0 = s1;
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    }
+
+    return s0;
+  }
+
+  function peg$parseexportedTo() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 10);
+    if (s1.toLowerCase() === peg$c75) {
+      peg$currPos += 10;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e79); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parseexportedToKeyEnd();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f67();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 11);
+      if (s1.toLowerCase() === peg$c74) {
+        peg$currPos += 11;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e77); }
+      }
+      if (s1 !== peg$FAILED) {
+        s2 = peg$currPos;
+        peg$silentFails++;
+        s3 = peg$parseexportedToKeyEnd();
+        peg$silentFails--;
+        if (s3 !== peg$FAILED) {
+          peg$currPos = s2;
+          s2 = undefined;
+        } else {
+          s2 = peg$FAILED;
+        }
+        if (s2 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s0 = peg$f68();
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    }
+
+    return s0;
+  }
+
+  function peg$parseexchangeRate() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 13);
+    if (s1.toLowerCase() === peg$c76) {
+      peg$currPos += 13;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e80); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f69();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsereimbursableTotal() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 18);
+    if (s1.toLowerCase() === peg$c77) {
+      peg$currPos += 18;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e81); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f70();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsenonReimbursableTotal() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 22);
+    if (s1.toLowerCase() === peg$c78) {
+      peg$currPos += 22;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e82); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f71();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsegroupFrom() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 10);
+    if (s1.toLowerCase() === peg$c79) {
+      peg$currPos += 10;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e83); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f72();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsegroupExpenses() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 14);
+    if (s1.toLowerCase() === peg$c80) {
+      peg$currPos += 14;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e84); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f73();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsegroupTotal() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 11);
+    if (s1.toLowerCase() === peg$c81) {
+      peg$currPos += 11;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e85); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f74();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsegroupCard() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 10);
+    if (s1.toLowerCase() === peg$c82) {
+      peg$currPos += 10;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e86); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f75();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsegroupFeed() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 10);
+    if (s1.toLowerCase() === peg$c83) {
+      peg$currPos += 10;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e87); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f76();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsegroupBankAccount() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 18);
+    if (s1.toLowerCase() === peg$c84) {
+      peg$currPos += 18;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e88); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f77();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsegroupWithdrawn() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 15);
+    if (s1.toLowerCase() === peg$c85) {
+      peg$currPos += 15;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e89); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f78();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
     }
-    s0 = s1;
 
     return s0;
   }
 
-  function peg$parsehas() {
-    let s0, s1;
+  function peg$parsegroupWithdrawalId() {
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c53) {
-      peg$currPos += (3);
+    s1 = input.substr(peg$currPos, 19);
+    if (s1.toLowerCase() === peg$c86) {
+      peg$currPos += 19;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e56); }
+      if (peg$silentFails === 0) { peg$fail(peg$e90); }
     }
     if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f46();
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f79();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
     }
-    s0 = s1;
 
     return s0;
   }
 
-  function peg$parseis() {
-    let s0, s1;
+  function peg$parsegroupCategory() {
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 2);
-    if (s1.toLowerCase() === peg$c54) {
-      peg$currPos += (2);
+    s1 = input.substr(peg$currPos, 14);
+    if (s1.toLowerCase() === peg$c87) {
+      peg$currPos += 14;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e57); }
+      if (peg$silentFails === 0) { peg$fail(peg$e91); }
     }
     if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f47();
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f80();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
     }
-    s0 = s1;
 
     return s0;
   }
 
-  function peg$parsepurchaseAmount() {
-    let s0, s1;
+  function peg$parsegroupTag() {
+    var s0, s1, s2, s3;
 
-    s0 = input.substr(peg$currPos, 14);
-    if (s0.toLowerCase() === peg$c55) {
-      peg$currPos += (14);
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 9);
+    if (s1.toLowerCase() === peg$c88) {
+      peg$currPos += 9;
     } else {
-      s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e58); }
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e92); }
     }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = input.substr(peg$currPos, 15);
-      if (s1.toLowerCase() === peg$c56) {
-        peg$currPos += (15);
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
       } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e59); }
+        s2 = peg$FAILED;
       }
-      if (s1 !== peg$FAILED) {
+      if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f48();
+        s0 = peg$f81();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
       }
-      s0 = s1;
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
     }
 
     return s0;
   }
 
-  function peg$parsepurchaseCurrency() {
-    let s0, s1;
+  function peg$parsegroupMerchant() {
+    var s0, s1, s2, s3;
 
-    s0 = input.substr(peg$currPos, 16);
-    if (s0.toLowerCase() === peg$c57) {
-      peg$currPos += (16);
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 14);
+    if (s1.toLowerCase() === peg$c89) {
+      peg$currPos += 14;
     } else {
-      s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e60); }
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e93); }
     }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = input.substr(peg$currPos, 17);
-      if (s1.toLowerCase() === peg$c58) {
-        peg$currPos += (17);
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
       } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e61); }
+        s2 = peg$FAILED;
       }
-      if (s1 !== peg$FAILED) {
+      if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f49();
+        s0 = peg$f82();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
       }
-      s0 = s1;
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
     }
 
     return s0;
   }
 
-  function peg$parsecolumns() {
-    let s0, s1;
+  function peg$parsegroupMonth() {
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 7);
-    if (s1.toLowerCase() === peg$c59) {
-      peg$currPos += (7);
+    s1 = input.substr(peg$currPos, 11);
+    if (s1.toLowerCase() === peg$c90) {
+      peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e62); }
+      if (peg$silentFails === 0) { peg$fail(peg$e94); }
     }
     if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f50();
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f83();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
     }
-    s0 = s1;
 
     return s0;
   }
 
-  function peg$parseview() {
-    let s0, s1;
+  function peg$parsegroupWeek() {
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c60) {
-      peg$currPos += (4);
+    s1 = input.substr(peg$currPos, 10);
+    if (s1.toLowerCase() === peg$c91) {
+      peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e63); }
+      if (peg$silentFails === 0) { peg$fail(peg$e95); }
     }
     if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f51();
-    }
-    s0 = s1;
-
-    return s0;
-  }
-
-  function peg$parseexportedToKeyEnd() {
-    let s0, s1, s2;
-
-    s0 = peg$parsewordBoundary();
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = peg$parse_();
-      s2 = input.charAt(peg$currPos);
-      if (peg$r1.test(s2)) {
-        peg$currPos++;
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e64); }
       }
       if (s2 !== peg$FAILED) {
-        s1 = [s1, s2];
-        s0 = s1;
+        peg$savedPos = s0;
+        s0 = peg$f84();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
       }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
     }
 
     return s0;
   }
 
-  function peg$parseexportedTo() {
-    let s0, s1, s2, s3;
+  function peg$parsegroupYear() {
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c61) {
-      peg$currPos += (10);
+    if (s1.toLowerCase() === peg$c92) {
+      peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e65); }
+      if (peg$silentFails === 0) { peg$fail(peg$e96); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
       peg$silentFails++;
-      s3 = peg$parseexportedToKeyEnd();
+      s3 = peg$parsewordBoundary();
       peg$silentFails--;
       if (s3 !== peg$FAILED) {
         peg$currPos = s2;
@@ -2196,7 +3571,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f52();
+        s0 = peg$f85();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2205,57 +3580,62 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = input.substr(peg$currPos, 11);
-      if (s1.toLowerCase() === peg$c62) {
-        peg$currPos += (11);
+
+    return s0;
+  }
+
+  function peg$parsegroupQuarter() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 13);
+    if (s1.toLowerCase() === peg$c93) {
+      peg$currPos += 13;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e97); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
       } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e66); }
+        s2 = peg$FAILED;
       }
-      if (s1 !== peg$FAILED) {
-        s2 = peg$currPos;
-        peg$silentFails++;
-        s3 = peg$parseexportedToKeyEnd();
-        peg$silentFails--;
-        if (s3 !== peg$FAILED) {
-          peg$currPos = s2;
-          s2 = undefined;
-        } else {
-          s2 = peg$FAILED;
-        }
-        if (s2 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s0 = peg$f53();
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f86();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
       }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
     }
 
     return s0;
   }
 
   function peg$parseoperator() {
-    let s0, s1;
+    var s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c63) {
-      s1 = peg$c63;
+    if (input.substr(peg$currPos, 2) === peg$c94) {
+      s1 = peg$c94;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e68); }
+      if (peg$silentFails === 0) { peg$fail(peg$e99); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f54();
+      s1 = peg$f87();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
@@ -2265,81 +3645,81 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e64); }
+        if (peg$silentFails === 0) { peg$fail(peg$e78); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f55();
+        s1 = peg$f88();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 2) === peg$c64) {
-          s1 = peg$c64;
+        if (input.substr(peg$currPos, 2) === peg$c95) {
+          s1 = peg$c95;
           peg$currPos += 2;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e69); }
+          if (peg$silentFails === 0) { peg$fail(peg$e100); }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f56();
+          s1 = peg$f89();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
-          if (input.substr(peg$currPos, 2) === peg$c65) {
-            s1 = peg$c65;
+          if (input.substr(peg$currPos, 2) === peg$c96) {
+            s1 = peg$c96;
             peg$currPos += 2;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e70); }
+            if (peg$silentFails === 0) { peg$fail(peg$e101); }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$f57();
+            s1 = peg$f90();
           }
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
             if (input.charCodeAt(peg$currPos) === 62) {
-              s1 = peg$c66;
+              s1 = peg$c97;
               peg$currPos++;
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e71); }
+              if (peg$silentFails === 0) { peg$fail(peg$e102); }
             }
             if (s1 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$f58();
+              s1 = peg$f91();
             }
             s0 = s1;
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
-              if (input.substr(peg$currPos, 2) === peg$c67) {
-                s1 = peg$c67;
+              if (input.substr(peg$currPos, 2) === peg$c98) {
+                s1 = peg$c98;
                 peg$currPos += 2;
               } else {
                 s1 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e72); }
+                if (peg$silentFails === 0) { peg$fail(peg$e103); }
               }
               if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$f59();
+                s1 = peg$f92();
               }
               s0 = s1;
               if (s0 === peg$FAILED) {
                 s0 = peg$currPos;
                 if (input.charCodeAt(peg$currPos) === 60) {
-                  s1 = peg$c68;
+                  s1 = peg$c99;
                   peg$currPos++;
                 } else {
                   s1 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e73); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e104); }
                 }
                 if (s1 !== peg$FAILED) {
                   peg$savedPos = s0;
-                  s1 = peg$f60();
+                  s1 = peg$f93();
                 }
                 s0 = s1;
               }
@@ -2351,20 +3731,20 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e67); }
+      if (peg$silentFails === 0) { peg$fail(peg$e98); }
     }
 
     return s0;
   }
 
   function peg$parsefilterOperator() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parseoperator();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f61(s1);
+      s1 = peg$f94(s1);
     }
     s0 = s1;
 
@@ -2372,7 +3752,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsealphanumeric() {
-    let s0, s1, s2;
+    var s0, s1, s2;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -2382,7 +3762,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e75); }
+      if (peg$silentFails === 0) { peg$fail(peg$e106); }
     }
     if (s2 !== peg$FAILED) {
       while (s2 !== peg$FAILED) {
@@ -2392,7 +3772,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e75); }
+          if (peg$silentFails === 0) { peg$fail(peg$e106); }
         }
       }
     } else {
@@ -2400,32 +3780,32 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f62(s1);
+      s1 = peg$f95(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e74); }
+      if (peg$silentFails === 0) { peg$fail(peg$e105); }
     }
 
     return s0;
   }
 
   function peg$parselogicalAnd() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
     peg$savedPos = s0;
-    s1 = peg$f63();
+    s1 = peg$f96();
     s0 = s1;
 
     return s0;
   }
 
   function peg$parse_() {
-    let s0, s1;
+    var s0, s1;
 
     peg$silentFails++;
     s0 = [];
@@ -2434,7 +3814,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e76); }
+      if (peg$silentFails === 0) { peg$fail(peg$e108); }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
@@ -2443,20 +3823,22 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e76); }
+        if (peg$silentFails === 0) { peg$fail(peg$e108); }
       }
     }
     peg$silentFails--;
+    s1 = peg$FAILED;
+    if (peg$silentFails === 0) { peg$fail(peg$e107); }
 
     return s0;
   }
 
   function peg$parsequotedString() {
-    let s0, s1, s2;
+    var s0, s1, s2;
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
-    s1 = peg$f64();
+    s1 = peg$f97();
     if (s1) {
       s1 = undefined;
     } else {
@@ -2483,7 +3865,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesimpleQuotedString() {
-    let s0, s1, s2, s3, s4, s5, s6;
+    var s0, s1, s2, s3, s4, s5, s6;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -2493,7 +3875,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e78); }
+      if (peg$silentFails === 0) { peg$fail(peg$e110); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -2502,7 +3884,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e78); }
+        if (peg$silentFails === 0) { peg$fail(peg$e110); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -2510,7 +3892,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e79); }
+      if (peg$silentFails === 0) { peg$fail(peg$e111); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -2519,7 +3901,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e80); }
+        if (peg$silentFails === 0) { peg$fail(peg$e112); }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
@@ -2528,7 +3910,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e80); }
+          if (peg$silentFails === 0) { peg$fail(peg$e112); }
         }
       }
       s4 = input.charAt(peg$currPos);
@@ -2536,7 +3918,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e79); }
+        if (peg$silentFails === 0) { peg$fail(peg$e111); }
       }
       if (s4 !== peg$FAILED) {
         s5 = [];
@@ -2545,7 +3927,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e75); }
+          if (peg$silentFails === 0) { peg$fail(peg$e106); }
         }
         while (s6 !== peg$FAILED) {
           s5.push(s6);
@@ -2554,11 +3936,11 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e75); }
+            if (peg$silentFails === 0) { peg$fail(peg$e106); }
           }
         }
         peg$savedPos = s0;
-        s0 = peg$f65(s1, s3, s5);
+        s0 = peg$f98(s1, s3, s5);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2570,14 +3952,14 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e77); }
+      if (peg$silentFails === 0) { peg$fail(peg$e109); }
     }
 
     return s0;
   }
 
   function peg$parsenestedQuotedString() {
-    let s0, s1, s2, s3, s4, s5, s6;
+    var s0, s1, s2, s3, s4, s5, s6;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -2587,7 +3969,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e78); }
+      if (peg$silentFails === 0) { peg$fail(peg$e110); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -2596,7 +3978,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e78); }
+        if (peg$silentFails === 0) { peg$fail(peg$e110); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -2604,7 +3986,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e79); }
+      if (peg$silentFails === 0) { peg$fail(peg$e111); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -2613,7 +3995,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e80); }
+        if (peg$silentFails === 0) { peg$fail(peg$e112); }
       }
       if (s4 === peg$FAILED) {
         s4 = peg$currPos;
@@ -2629,15 +4011,15 @@ function peg$parse(input, options) {
         }
         if (s5 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 8220) {
-            s6 = peg$c69;
+            s6 = peg$c100;
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e81); }
+            if (peg$silentFails === 0) { peg$fail(peg$e113); }
           }
           if (s6 !== peg$FAILED) {
             peg$savedPos = s4;
-            s4 = peg$f66(s1);
+            s4 = peg$f99(s1);
           } else {
             peg$currPos = s4;
             s4 = peg$FAILED;
@@ -2660,15 +4042,15 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8221) {
-              s6 = peg$c70;
+              s6 = peg$c101;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e82); }
+              if (peg$silentFails === 0) { peg$fail(peg$e114); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f67(s1);
+              s4 = peg$f100(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -2691,15 +4073,15 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 34) {
-                s6 = peg$c71;
+                s6 = peg$c102;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e83); }
+                if (peg$silentFails === 0) { peg$fail(peg$e115); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f68(s1);
+                s4 = peg$f101(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -2718,7 +4100,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e80); }
+          if (peg$silentFails === 0) { peg$fail(peg$e112); }
         }
         if (s4 === peg$FAILED) {
           s4 = peg$currPos;
@@ -2734,15 +4116,15 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8220) {
-              s6 = peg$c69;
+              s6 = peg$c100;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e81); }
+              if (peg$silentFails === 0) { peg$fail(peg$e113); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f66(s1);
+              s4 = peg$f99(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -2765,15 +4147,15 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 8221) {
-                s6 = peg$c70;
+                s6 = peg$c101;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e82); }
+                if (peg$silentFails === 0) { peg$fail(peg$e114); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f67(s1);
+                s4 = peg$f100(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -2796,15 +4178,15 @@ function peg$parse(input, options) {
               }
               if (s5 !== peg$FAILED) {
                 if (input.charCodeAt(peg$currPos) === 34) {
-                  s6 = peg$c71;
+                  s6 = peg$c102;
                   peg$currPos++;
                 } else {
                   s6 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e83); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e115); }
                 }
                 if (s6 !== peg$FAILED) {
                   peg$savedPos = s4;
-                  s4 = peg$f68(s1);
+                  s4 = peg$f101(s1);
                 } else {
                   peg$currPos = s4;
                   s4 = peg$FAILED;
@@ -2820,7 +4202,7 @@ function peg$parse(input, options) {
       s4 = peg$parseclosingQuote();
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f69(s1, s3, s4);
+        s0 = peg$f102(s1, s3, s4);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2832,14 +4214,14 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e77); }
+      if (peg$silentFails === 0) { peg$fail(peg$e109); }
     }
 
     return s0;
   }
 
   function peg$parseclosingQuote() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.charAt(peg$currPos);
@@ -2847,7 +4229,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e79); }
+      if (peg$silentFails === 0) { peg$fail(peg$e111); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -2876,7 +4258,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsevalidClosingCondition() {
-    let s0, s1, s2, s3, s4;
+    var s0, s1, s2, s3, s4;
 
     s0 = peg$currPos;
     s1 = [];
@@ -2885,7 +4267,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e84); }
+      if (peg$silentFails === 0) { peg$fail(peg$e116); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -2894,7 +4276,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e84); }
+        if (peg$silentFails === 0) { peg$fail(peg$e116); }
       }
     }
     s2 = [];
@@ -2903,7 +4285,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s3 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e85); }
+      if (peg$silentFails === 0) { peg$fail(peg$e117); }
     }
     while (s3 !== peg$FAILED) {
       s2.push(s3);
@@ -2912,7 +4294,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e85); }
+        if (peg$silentFails === 0) { peg$fail(peg$e117); }
       }
     }
     s3 = [];
@@ -2921,7 +4303,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s4 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e86); }
+      if (peg$silentFails === 0) { peg$fail(peg$e118); }
     }
     while (s4 !== peg$FAILED) {
       s3.push(s4);
@@ -2930,7 +4312,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e86); }
+        if (peg$silentFails === 0) { peg$fail(peg$e118); }
       }
     }
     s4 = peg$parseoperator();
@@ -2949,7 +4331,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e87); }
+        if (peg$silentFails === 0) { peg$fail(peg$e119); }
       }
       while (s2 !== peg$FAILED) {
         s1.push(s2);
@@ -2958,7 +4340,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e87); }
+          if (peg$silentFails === 0) { peg$fail(peg$e119); }
         }
       }
       s2 = peg$currPos;
@@ -3005,7 +4387,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e88); }
+          if (peg$silentFails === 0) { peg$fail(peg$e120); }
         }
       }
     }
@@ -3014,14 +4396,14 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewordBoundary() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = input.charAt(peg$currPos);
     if (peg$r12.test(s0)) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e89); }
+      if (peg$silentFails === 0) { peg$fail(peg$e121); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
@@ -3060,35 +4442,29 @@ function peg$parse(input, options) {
 
   peg$result = peg$startRuleFunction();
 
-  const peg$success = (peg$result !== peg$FAILED && peg$currPos === input.length);
-  function peg$throw() {
-    if (peg$result !== peg$FAILED && peg$currPos < input.length) {
-      peg$fail(peg$endExpectation());
-    }
-
-    throw peg$buildStructuredError(
-      peg$maxFailExpected,
-      peg$maxFailPos < input.length ? peg$getUnicode(peg$maxFailPos) : null,
-      peg$maxFailPos < input.length
-        ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1)
-        : peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
-    );
-  }
   if (options.peg$library) {
     return /** @type {any} */ ({
       peg$result,
       peg$currPos,
       peg$FAILED,
       peg$maxFailExpected,
-      peg$maxFailPos,
-      peg$success,
-      peg$throw: peg$success ? undefined : peg$throw,
+      peg$maxFailPos
     });
   }
-  if (peg$success) {
+  if (peg$result !== peg$FAILED && peg$currPos === input.length) {
     return peg$result;
   } else {
-    peg$throw();
+    if (peg$result !== peg$FAILED && peg$currPos < input.length) {
+      peg$fail(peg$endExpectation());
+    }
+
+    throw peg$buildStructuredError(
+      peg$maxFailExpected,
+      peg$maxFailPos < input.length ? input.charAt(peg$maxFailPos) : null,
+      peg$maxFailPos < input.length
+        ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1)
+        : peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
+    );
   }
 }
 
diff --git a/src/libs/SearchParser/searchParser.js b/src/libs/SearchParser/searchParser.js
index f38d92cffd86..52712ed2731b 100644
--- a/src/libs/SearchParser/searchParser.js
+++ b/src/libs/SearchParser/searchParser.js
@@ -1,4 +1,4 @@
-// @generated by Peggy 5.0.6.
+// @generated by Peggy 4.0.3.
 //
 // https://peggyjs.org/
 
@@ -12,615 +12,627 @@
     return { operator, left, right };
   }
 
-class peg$SyntaxError extends SyntaxError {
-  constructor(message, expected, found, location) {
-    super(message);
-    this.expected = expected;
-    this.found = found;
-    this.location = location;
-    this.name = "SyntaxError";
-  }
-
-  format(sources) {
-    let str = "Error: " + this.message;
-    if (this.location) {
-      let src = null;
-      const st = sources.find(s => s.source === this.location.source);
-      if (st) {
-        src = st.text.split(/\r\n|\n|\r/g);
-      }
-      const s = this.location.start;
-      const offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
-        ? this.location.source.offset(s)
-        : s;
-      const loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
-      if (src) {
-        const e = this.location.end;
-        const filler = "".padEnd(offset_s.line.toString().length, " ");
-        const line = src[s.line - 1];
-        const last = s.line === e.line ? e.column : line.length + 1;
-        const hatLen = (last - s.column) || 1;
-        str += "\n --> " + loc + "\n"
-            + filler + " |\n"
-            + offset_s.line + " | " + line + "\n"
-            + filler + " | " + "".padEnd(s.column - 1, " ")
-            + "".padEnd(hatLen, "^");
-      } else {
-        str += "\n at " + loc;
-      }
-    }
-    return str;
-  }
-
-  static buildMessage(expected, found) {
-    function hex(ch) {
-      return ch.codePointAt(0).toString(16).toUpperCase();
-    }
+function peg$subclass(child, parent) {
+  function C() { this.constructor = child; }
+  C.prototype = parent.prototype;
+  child.prototype = new C();
+}
 
-    const nonPrintable = Object.prototype.hasOwnProperty.call(RegExp.prototype, "unicode")
-      ? new RegExp("[\\p{C}\\p{Mn}\\p{Mc}]", "gu")
-      : null;
-    function unicodeEscape(s) {
-      if (nonPrintable) {
-        return s.replace(nonPrintable,  ch => "\\u{" + hex(ch) + "}");
-      }
-      return s;
-    }
+function peg$SyntaxError(message, expected, found, location) {
+  var self = Error.call(this, message);
+  // istanbul ignore next Check is a necessary evil to support older environments
+  if (Object.setPrototypeOf) {
+    Object.setPrototypeOf(self, peg$SyntaxError.prototype);
+  }
+  self.expected = expected;
+  self.found = found;
+  self.location = location;
+  self.name = "SyntaxError";
+  return self;
+}
 
-    function literalEscape(s) {
-      return unicodeEscape(s
-        .replace(/\\/g, "\\\\")
-        .replace(/"/g,  "\\\"")
-        .replace(/\0/g, "\\0")
-        .replace(/\t/g, "\\t")
-        .replace(/\n/g, "\\n")
-        .replace(/\r/g, "\\r")
-        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
-        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
-    }
+peg$subclass(peg$SyntaxError, Error);
 
-    function classEscape(s) {
-      return unicodeEscape(s
-        .replace(/\\/g, "\\\\")
-        .replace(/\]/g, "\\]")
-        .replace(/\^/g, "\\^")
-        .replace(/-/g,  "\\-")
-        .replace(/\0/g, "\\0")
-        .replace(/\t/g, "\\t")
-        .replace(/\n/g, "\\n")
-        .replace(/\r/g, "\\r")
-        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
-        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
-    }
+function peg$padEnd(str, targetLength, padString) {
+  padString = padString || " ";
+  if (str.length > targetLength) { return str; }
+  targetLength -= str.length;
+  padString += padString.repeat(targetLength);
+  return str + padString.slice(0, targetLength);
+}
 
-    const DESCRIBE_EXPECTATION_FNS = {
-      literal(expectation) {
-        return "\"" + literalEscape(expectation.text) + "\"";
-      },
+peg$SyntaxError.prototype.format = function(sources) {
+  var str = "Error: " + this.message;
+  if (this.location) {
+    var src = null;
+    var k;
+    for (k = 0; k < sources.length; k++) {
+      if (sources[k].source === this.location.source) {
+        src = sources[k].text.split(/\r\n|\n|\r/g);
+        break;
+      }
+    }
+    var s = this.location.start;
+    var offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
+      ? this.location.source.offset(s)
+      : s;
+    var loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
+    if (src) {
+      var e = this.location.end;
+      var filler = peg$padEnd("", offset_s.line.toString().length, ' ');
+      var line = src[s.line - 1];
+      var last = s.line === e.line ? e.column : line.length + 1;
+      var hatLen = (last - s.column) || 1;
+      str += "\n --> " + loc + "\n"
+          + filler + " |\n"
+          + offset_s.line + " | " + line + "\n"
+          + filler + " | " + peg$padEnd("", s.column - 1, ' ')
+          + peg$padEnd("", hatLen, "^");
+    } else {
+      str += "\n at " + loc;
+    }
+  }
+  return str;
+};
 
-      class(expectation) {
-        const escapedParts = expectation.parts.map(
-          part => (Array.isArray(part)
-            ? classEscape(part[0]) + "-" + classEscape(part[1])
-            : classEscape(part))
-        );
+peg$SyntaxError.buildMessage = function(expected, found) {
+  var DESCRIBE_EXPECTATION_FNS = {
+    literal: function(expectation) {
+      return "\"" + literalEscape(expectation.text) + "\"";
+    },
 
-        return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]" + (expectation.unicode ? "u" : "");
-      },
+    class: function(expectation) {
+      var escapedParts = expectation.parts.map(function(part) {
+        return Array.isArray(part)
+          ? classEscape(part[0]) + "-" + classEscape(part[1])
+          : classEscape(part);
+      });
 
-      any() {
-        return "any character";
-      },
+      return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]";
+    },
 
-      end() {
-        return "end of input";
-      },
+    any: function() {
+      return "any character";
+    },
 
-      other(expectation) {
-        return expectation.description;
-      },
-    };
+    end: function() {
+      return "end of input";
+    },
 
-    function describeExpectation(expectation) {
-      return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
+    other: function(expectation) {
+      return expectation.description;
     }
+  };
+
+  function hex(ch) {
+    return ch.charCodeAt(0).toString(16).toUpperCase();
+  }
 
-    function describeExpected(expected) {
-      const descriptions = expected.map(describeExpectation);
-      descriptions.sort();
+  function literalEscape(s) {
+    return s
+      .replace(/\\/g, "\\\\")
+      .replace(/"/g,  "\\\"")
+      .replace(/\0/g, "\\0")
+      .replace(/\t/g, "\\t")
+      .replace(/\n/g, "\\n")
+      .replace(/\r/g, "\\r")
+      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
+      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
+  }
 
-      if (descriptions.length > 0) {
-        let j = 1;
-        for (let i = 1; i < descriptions.length; i++) {
-          if (descriptions[i - 1] !== descriptions[i]) {
-            descriptions[j] = descriptions[i];
-            j++;
-          }
-        }
-        descriptions.length = j;
-      }
+  function classEscape(s) {
+    return s
+      .replace(/\\/g, "\\\\")
+      .replace(/\]/g, "\\]")
+      .replace(/\^/g, "\\^")
+      .replace(/-/g,  "\\-")
+      .replace(/\0/g, "\\0")
+      .replace(/\t/g, "\\t")
+      .replace(/\n/g, "\\n")
+      .replace(/\r/g, "\\r")
+      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
+      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
+  }
 
-      switch (descriptions.length) {
-        case 1:
-          return descriptions[0];
+  function describeExpectation(expectation) {
+    return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
+  }
+
+  function describeExpected(expected) {
+    var descriptions = expected.map(describeExpectation);
+    var i, j;
 
-        case 2:
-          return descriptions[0] + " or " + descriptions[1];
+    descriptions.sort();
 
-        default:
-          return descriptions.slice(0, -1).join(", ")
-            + ", or "
-            + descriptions[descriptions.length - 1];
+    if (descriptions.length > 0) {
+      for (i = 1, j = 1; i < descriptions.length; i++) {
+        if (descriptions[i - 1] !== descriptions[i]) {
+          descriptions[j] = descriptions[i];
+          j++;
+        }
       }
+      descriptions.length = j;
     }
 
-    function describeFound(found) {
-      return found ? "\"" + literalEscape(found) + "\"" : "end of input";
+    switch (descriptions.length) {
+      case 1:
+        return descriptions[0];
+
+      case 2:
+        return descriptions[0] + " or " + descriptions[1];
+
+      default:
+        return descriptions.slice(0, -1).join(", ")
+          + ", or "
+          + descriptions[descriptions.length - 1];
     }
+  }
 
-    return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
+  function describeFound(found) {
+    return found ? "\"" + literalEscape(found) + "\"" : "end of input";
   }
-}
+
+  return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
+};
 
 function peg$parse(input, options) {
   options = options !== undefined ? options : {};
 
-  const peg$FAILED = {};
-  const peg$source = options.grammarSource;
-
-  const peg$startRuleFunctions = {
-    query: peg$parsequery,
-  };
-  let peg$startRuleFunction = peg$parsequery;
-
-  const peg$c0 = "-";
-  const peg$c1 = "report-field";
-  const peg$c2 = "reportfield";
-  const peg$c3 = ",";
-  const peg$c4 = "date";
-  const peg$c5 = "amount";
-  const peg$c6 = "merchant";
-  const peg$c7 = "description";
-  const peg$c8 = "reportid";
-  const peg$c9 = "report-id";
-  const peg$c10 = "keyword";
-  const peg$c11 = "in";
-  const peg$c12 = "currency";
-  const peg$c13 = "groupCurrency";
-  const peg$c14 = "group-currency";
-  const peg$c15 = "tag";
-  const peg$c16 = "category";
-  const peg$c17 = "to";
-  const peg$c18 = "exporter";
-  const peg$c19 = "payer";
-  const peg$c20 = "taxrate";
-  const peg$c21 = "tax-rate";
-  const peg$c22 = "cardID";
-  const peg$c23 = "card";
-  const peg$c24 = "from";
-  const peg$c25 = "attendee";
-  const peg$c26 = "expenseType";
-  const peg$c27 = "expense-type";
-  const peg$c28 = "withdrawalType";
-  const peg$c29 = "withdrawal-type";
-  const peg$c30 = "withdrawalid";
-  const peg$c31 = "withdrawal-id";
-  const peg$c32 = "billable";
-  const peg$c33 = "reimbursable";
-  const peg$c34 = "type";
-  const peg$c35 = "status";
-  const peg$c36 = "sortBy";
-  const peg$c37 = "sort-by";
-  const peg$c38 = "sortOrder";
-  const peg$c39 = "sort-order";
-  const peg$c40 = "policyID";
-  const peg$c41 = "workspace";
-  const peg$c42 = "submitted";
-  const peg$c43 = "approved";
-  const peg$c44 = "paid";
-  const peg$c45 = "exported";
-  const peg$c46 = "posted";
-  const peg$c47 = "withdrawn";
-  const peg$c48 = "groupby";
-  const peg$c49 = "group-by";
-  const peg$c50 = "limit";
-  const peg$c51 = "feed";
-  const peg$c52 = "title";
-  const peg$c53 = "assignee";
-  const peg$c54 = "createdby";
-  const peg$c55 = "created-by";
-  const peg$c56 = "action";
-  const peg$c57 = "total";
-  const peg$c58 = "has";
-  const peg$c59 = "is";
-  const peg$c60 = "purchaseamount";
-  const peg$c61 = "purchase-amount";
-  const peg$c62 = "purchasecurrency";
-  const peg$c63 = "purchase-currency";
-  const peg$c64 = "columns";
-  const peg$c65 = "view";
-  const peg$c66 = "per-diem";
-  const peg$c67 = "drafts";
-  const peg$c68 = "draft";
-  const peg$c69 = "original-amount";
-  const peg$c70 = "tax";
-  const peg$c71 = "policy-name";
-  const peg$c72 = "bank-account";
-  const peg$c73 = "long-report-id";
-  const peg$c74 = "exported-to";
-  const peg$c75 = "exportedto";
-  const peg$c76 = "exchange-rate";
-  const peg$c77 = "reimbursable-total";
-  const peg$c78 = "non-reimbursable-total";
-  const peg$c79 = "group-from";
-  const peg$c80 = "group-expenses";
-  const peg$c81 = "group-total";
-  const peg$c82 = "group-card";
-  const peg$c83 = "group-feed";
-  const peg$c84 = "group-bank-account";
-  const peg$c85 = "group-withdrawn";
-  const peg$c86 = "group-withdrawal-id";
-  const peg$c87 = "group-category";
-  const peg$c88 = "group-tag";
-  const peg$c89 = "group-merchant";
-  const peg$c90 = "group-month";
-  const peg$c91 = "group-week";
-  const peg$c92 = "group-year";
-  const peg$c93 = "group-quarter";
-  const peg$c94 = "*:";
-  const peg$c95 = "!=";
-  const peg$c96 = ">=";
-  const peg$c97 = ">";
-  const peg$c98 = "<=";
-  const peg$c99 = "<";
-  const peg$c100 = "\u201C";
-  const peg$c101 = "\u201D";
-  const peg$c102 = "\"";
-
-  const peg$r0 = /^[^ \t\r\n\xA0]/;
-  const peg$r1 = /^[ \t\r\n\xA0,:=<>!]/;
-  const peg$r2 = /^[:=]/;
-  const peg$r3 = /^[^ ,\t\n\r\xA0]/;
-  const peg$r4 = /^[ \t\r\n\xA0]/;
-  const peg$r5 = /^[^ ,"\u201D\u201C\t\n\r\xA0]/;
-  const peg$r6 = /^["\u201C-\u201D]/;
-  const peg$r7 = /^[^"\u201D\u201C\r\n]/;
-  const peg$r8 = /^[ \t\n\r\xA0a-zA-Z0-9]/;
-  const peg$r9 = /^[a-zA-Z0-9]/;
-  const peg$r10 = /^[ \t\n\r\xA0]/;
-  const peg$r11 = /^[ \t\n\r\xA0a-zA-Z]/;
-  const peg$r12 = /^[,]/;
-  const peg$r13 = /^[ \t\n\r\xA0,]/;
-
-  const peg$e0 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], true, false, false);
-  const peg$e1 = peg$literalExpectation("-", false);
-  const peg$e2 = peg$literalExpectation("report-field", true);
-  const peg$e3 = peg$literalExpectation("reportfield", true);
-  const peg$e4 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0", ",", ":", "=", "<", ">", "!"], false, false, false);
-  const peg$e5 = peg$anyExpectation();
-  const peg$e6 = peg$otherExpectation("key");
-  const peg$e7 = peg$otherExpectation("default key");
-  const peg$e8 = peg$literalExpectation(",", false);
-  const peg$e9 = peg$literalExpectation("date", true);
-  const peg$e10 = peg$literalExpectation("amount", true);
-  const peg$e11 = peg$literalExpectation("merchant", true);
-  const peg$e12 = peg$literalExpectation("description", true);
-  const peg$e13 = peg$literalExpectation("reportid", true);
-  const peg$e14 = peg$literalExpectation("report-id", true);
-  const peg$e15 = peg$literalExpectation("keyword", true);
-  const peg$e16 = peg$literalExpectation("in", true);
-  const peg$e17 = peg$literalExpectation("currency", true);
-  const peg$e18 = peg$literalExpectation("groupCurrency", false);
-  const peg$e19 = peg$literalExpectation("group-currency", true);
-  const peg$e20 = peg$literalExpectation("tag", true);
-  const peg$e21 = peg$literalExpectation("category", true);
-  const peg$e22 = peg$literalExpectation("to", true);
-  const peg$e23 = peg$literalExpectation("exporter", true);
-  const peg$e24 = peg$literalExpectation("payer", true);
-  const peg$e25 = peg$literalExpectation("taxRate", true);
-  const peg$e26 = peg$literalExpectation("tax-rate", true);
-  const peg$e27 = peg$literalExpectation("cardID", false);
-  const peg$e28 = peg$literalExpectation("card", true);
-  const peg$e29 = peg$literalExpectation("from", true);
-  const peg$e30 = peg$literalExpectation("attendee", true);
-  const peg$e31 = peg$literalExpectation("expenseType", false);
-  const peg$e32 = peg$literalExpectation("expense-type", true);
-  const peg$e33 = peg$literalExpectation("withdrawalType", false);
-  const peg$e34 = peg$literalExpectation("withdrawal-type", true);
-  const peg$e35 = peg$literalExpectation("withdrawalID", true);
-  const peg$e36 = peg$literalExpectation("withdrawal-id", true);
-  const peg$e37 = peg$literalExpectation("billable", true);
-  const peg$e38 = peg$literalExpectation("reimbursable", true);
-  const peg$e39 = peg$literalExpectation("type", true);
-  const peg$e40 = peg$literalExpectation("status", true);
-  const peg$e41 = peg$literalExpectation("sortBy", false);
-  const peg$e42 = peg$literalExpectation("sort-by", true);
-  const peg$e43 = peg$literalExpectation("sortOrder", false);
-  const peg$e44 = peg$literalExpectation("sort-order", true);
-  const peg$e45 = peg$literalExpectation("policyID", false);
-  const peg$e46 = peg$literalExpectation("workspace", true);
-  const peg$e47 = peg$literalExpectation("submitted", true);
-  const peg$e48 = peg$literalExpectation("approved", true);
-  const peg$e49 = peg$literalExpectation("paid", true);
-  const peg$e50 = peg$literalExpectation("exported", true);
-  const peg$e51 = peg$literalExpectation("posted", true);
-  const peg$e52 = peg$literalExpectation("withdrawn", true);
-  const peg$e53 = peg$literalExpectation("groupBy", true);
-  const peg$e54 = peg$literalExpectation("group-by", true);
-  const peg$e55 = peg$literalExpectation("limit", true);
-  const peg$e56 = peg$literalExpectation("feed", true);
-  const peg$e57 = peg$literalExpectation("title", true);
-  const peg$e58 = peg$literalExpectation("assignee", true);
-  const peg$e59 = peg$literalExpectation("createdBy", true);
-  const peg$e60 = peg$literalExpectation("created-by", true);
-  const peg$e61 = peg$literalExpectation("action", true);
-  const peg$e62 = peg$literalExpectation("total", true);
-  const peg$e63 = peg$literalExpectation("has", true);
-  const peg$e64 = peg$literalExpectation("is", true);
-  const peg$e65 = peg$literalExpectation("purchaseAmount", true);
-  const peg$e66 = peg$literalExpectation("purchase-amount", true);
-  const peg$e67 = peg$literalExpectation("purchaseCurrency", true);
-  const peg$e68 = peg$literalExpectation("purchase-currency", true);
-  const peg$e69 = peg$literalExpectation("columns", true);
-  const peg$e70 = peg$literalExpectation("view", true);
-  const peg$e71 = peg$literalExpectation("per-diem", true);
-  const peg$e72 = peg$literalExpectation("drafts", true);
-  const peg$e73 = peg$literalExpectation("draft", true);
-  const peg$e74 = peg$literalExpectation("original-amount", true);
-  const peg$e75 = peg$literalExpectation("tax", true);
-  const peg$e76 = peg$literalExpectation("policy-name", true);
-  const peg$e77 = peg$literalExpectation("bank-account", true);
-  const peg$e78 = peg$literalExpectation("long-report-id", true);
-  const peg$e79 = peg$literalExpectation("exported-to", true);
-  const peg$e80 = peg$classExpectation([":", "="], false, false, false);
-  const peg$e81 = peg$literalExpectation("exportedTo", true);
-  const peg$e82 = peg$literalExpectation("exchange-rate", true);
-  const peg$e83 = peg$literalExpectation("reimbursable-total", true);
-  const peg$e84 = peg$literalExpectation("non-reimbursable-total", true);
-  const peg$e85 = peg$literalExpectation("group-from", true);
-  const peg$e86 = peg$literalExpectation("group-expenses", true);
-  const peg$e87 = peg$literalExpectation("group-total", true);
-  const peg$e88 = peg$literalExpectation("group-card", true);
-  const peg$e89 = peg$literalExpectation("group-feed", true);
-  const peg$e90 = peg$literalExpectation("group-bank-account", true);
-  const peg$e91 = peg$literalExpectation("group-withdrawn", true);
-  const peg$e92 = peg$literalExpectation("group-withdrawal-id", true);
-  const peg$e93 = peg$literalExpectation("group-category", true);
-  const peg$e94 = peg$literalExpectation("group-tag", true);
-  const peg$e95 = peg$literalExpectation("group-merchant", true);
-  const peg$e96 = peg$literalExpectation("group-month", true);
-  const peg$e97 = peg$literalExpectation("group-week", true);
-  const peg$e98 = peg$literalExpectation("group-year", true);
-  const peg$e99 = peg$literalExpectation("group-quarter", true);
-  const peg$e100 = peg$otherExpectation("operator");
-  const peg$e101 = peg$literalExpectation("*:", false);
-  const peg$e102 = peg$literalExpectation("!=", false);
-  const peg$e103 = peg$literalExpectation(">=", false);
-  const peg$e104 = peg$literalExpectation(">", false);
-  const peg$e105 = peg$literalExpectation("<=", false);
-  const peg$e106 = peg$literalExpectation("<", false);
-  const peg$e107 = peg$otherExpectation("word");
-  const peg$e108 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false, false);
-  const peg$e109 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false, false);
-  const peg$e110 = peg$otherExpectation("quote");
-  const peg$e111 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false, false);
-  const peg$e112 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false, false);
-  const peg$e113 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false, false);
-  const peg$e114 = peg$literalExpectation("\u201C", false);
-  const peg$e115 = peg$literalExpectation("\u201D", false);
-  const peg$e116 = peg$literalExpectation("\"", false);
-  const peg$e117 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false, false);
-  const peg$e118 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false, false);
-  const peg$e119 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false, false);
-  const peg$e120 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false, false);
-  const peg$e121 = peg$classExpectation([","], false, false, false);
-  const peg$e122 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false, false);
-
-  function peg$f0(filters) {    return applyDefaults(filters);  }
-  function peg$f1(head, tail) {
-    const allFilters = [head, ...tail.map(([_, filter]) => filter)]
-      .filter(Boolean)
-      .filter((filter) => filter.right);
-    rawFilterList = allFilters.map(createRawFilter).filter(Boolean);
-
-    const filtersWithoutDefaults = allFilters.filter((filter) => !filter.isDefault);
-
-    if (!filtersWithoutDefaults.length) {
-      return null;
-    }
-
-    const keywords = filtersWithoutDefaults.filter(
-      (filter) =>
-        filter.left === "keyword" || filter.right?.left === "keyword"
-    );
-    const nonKeywords = filtersWithoutDefaults.filter(
-      (filter) =>
-        filter.left !== "keyword" && filter.right?.left !== "keyword"
-    );
-
-    const keywordFilter = buildFilter(
-      "eq",
-      "keyword",
-      keywords
-        .map((filter) => filter.right.replaceAll(/^(['"])(.*)\1$/g, "$2"))
-        .flat()
-    );
-    if (keywordFilter.right.length > 0) {
-      nonKeywords.push(keywordFilter);
-    }
-    return nonKeywords.reduce((result, filter) =>
-      buildFilter("and", result, filter)
-    );
-  }
-  function peg$f2(key, op, value) {
-    updateDefaultValues(key, value);
-    return {...buildFilter(op, key, value), isDefault: true};
-  }
-  function peg$f3(value) {
-    //handle no-breaking space
-    let word;
-    if (Array.isArray(value)) {
-      word = value.join("");
-    } else {
-      word = value;
-    }
-    return buildFilter("eq", "keyword", word);
-  }
-  function peg$f4(neg, field, op, values) {
-    expectingNestedQuote = false; nameOperator = false;
+  var peg$FAILED = {};
+  var peg$source = options.grammarSource;
+
+  var peg$startRuleFunctions = { query: peg$parsequery };
+  var peg$startRuleFunction = peg$parsequery;
+
+  var peg$c0 = "-";
+  var peg$c1 = "report-field";
+  var peg$c2 = "reportfield";
+  var peg$c3 = ",";
+  var peg$c4 = "date";
+  var peg$c5 = "amount";
+  var peg$c6 = "merchant";
+  var peg$c7 = "description";
+  var peg$c8 = "reportid";
+  var peg$c9 = "report-id";
+  var peg$c10 = "keyword";
+  var peg$c11 = "in";
+  var peg$c12 = "currency";
+  var peg$c13 = "groupCurrency";
+  var peg$c14 = "group-currency";
+  var peg$c15 = "tag";
+  var peg$c16 = "category";
+  var peg$c17 = "to";
+  var peg$c18 = "exporter";
+  var peg$c19 = "payer";
+  var peg$c20 = "taxrate";
+  var peg$c21 = "tax-rate";
+  var peg$c22 = "cardID";
+  var peg$c23 = "card";
+  var peg$c24 = "from";
+  var peg$c25 = "attendee";
+  var peg$c26 = "expenseType";
+  var peg$c27 = "expense-type";
+  var peg$c28 = "withdrawalType";
+  var peg$c29 = "withdrawal-type";
+  var peg$c30 = "withdrawalid";
+  var peg$c31 = "withdrawal-id";
+  var peg$c32 = "billable";
+  var peg$c33 = "reimbursable";
+  var peg$c34 = "type";
+  var peg$c35 = "status";
+  var peg$c36 = "sortBy";
+  var peg$c37 = "sort-by";
+  var peg$c38 = "sortOrder";
+  var peg$c39 = "sort-order";
+  var peg$c40 = "policyID";
+  var peg$c41 = "workspace";
+  var peg$c42 = "submitted";
+  var peg$c43 = "approved";
+  var peg$c44 = "paid";
+  var peg$c45 = "exported";
+  var peg$c46 = "posted";
+  var peg$c47 = "withdrawn";
+  var peg$c48 = "groupby";
+  var peg$c49 = "group-by";
+  var peg$c50 = "limit";
+  var peg$c51 = "feed";
+  var peg$c52 = "title";
+  var peg$c53 = "assignee";
+  var peg$c54 = "createdby";
+  var peg$c55 = "created-by";
+  var peg$c56 = "action";
+  var peg$c57 = "total";
+  var peg$c58 = "has";
+  var peg$c59 = "is";
+  var peg$c60 = "purchaseamount";
+  var peg$c61 = "purchase-amount";
+  var peg$c62 = "purchasecurrency";
+  var peg$c63 = "purchase-currency";
+  var peg$c64 = "columns";
+  var peg$c65 = "view";
+  var peg$c66 = "per-diem";
+  var peg$c67 = "drafts";
+  var peg$c68 = "draft";
+  var peg$c69 = "original-amount";
+  var peg$c70 = "tax";
+  var peg$c71 = "policy-name";
+  var peg$c72 = "bank-account";
+  var peg$c73 = "long-report-id";
+  var peg$c74 = "exported-to";
+  var peg$c75 = "exportedto";
+  var peg$c76 = "exchange-rate";
+  var peg$c77 = "reimbursable-total";
+  var peg$c78 = "non-reimbursable-total";
+  var peg$c79 = "group-from";
+  var peg$c80 = "group-expenses";
+  var peg$c81 = "group-total";
+  var peg$c82 = "group-card";
+  var peg$c83 = "group-feed";
+  var peg$c84 = "group-bank-account";
+  var peg$c85 = "group-withdrawn";
+  var peg$c86 = "group-withdrawal-id";
+  var peg$c87 = "group-category";
+  var peg$c88 = "group-tag";
+  var peg$c89 = "group-merchant";
+  var peg$c90 = "group-month";
+  var peg$c91 = "group-week";
+  var peg$c92 = "group-year";
+  var peg$c93 = "group-quarter";
+  var peg$c94 = "*:";
+  var peg$c95 = "!=";
+  var peg$c96 = ">=";
+  var peg$c97 = ">";
+  var peg$c98 = "<=";
+  var peg$c99 = "<";
+  var peg$c100 = "\u201C";
+  var peg$c101 = "\u201D";
+  var peg$c102 = "\"";
+
+  var peg$r0 = /^[^ \t\r\n\xA0]/;
+  var peg$r1 = /^[ \t\r\n\xA0,:=<>!]/;
+  var peg$r2 = /^[:=]/;
+  var peg$r3 = /^[^ ,\t\n\r\xA0]/;
+  var peg$r4 = /^[ \t\r\n\xA0]/;
+  var peg$r5 = /^[^ ,"\u201D\u201C\t\n\r\xA0]/;
+  var peg$r6 = /^["\u201C-\u201D]/;
+  var peg$r7 = /^[^"\u201D\u201C\r\n]/;
+  var peg$r8 = /^[ \t\n\r\xA0a-zA-Z0-9]/;
+  var peg$r9 = /^[a-zA-Z0-9]/;
+  var peg$r10 = /^[ \t\n\r\xA0]/;
+  var peg$r11 = /^[ \t\n\r\xA0a-zA-Z]/;
+  var peg$r12 = /^[,]/;
+  var peg$r13 = /^[ \t\n\r\xA0,]/;
+
+  var peg$e0 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], true, false);
+  var peg$e1 = peg$literalExpectation("-", false);
+  var peg$e2 = peg$literalExpectation("report-field", true);
+  var peg$e3 = peg$literalExpectation("reportfield", true);
+  var peg$e4 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0", ",", ":", "=", "<", ">", "!"], false, false);
+  var peg$e5 = peg$anyExpectation();
+  var peg$e6 = peg$otherExpectation("key");
+  var peg$e7 = peg$otherExpectation("default key");
+  var peg$e8 = peg$literalExpectation(",", false);
+  var peg$e9 = peg$literalExpectation("date", true);
+  var peg$e10 = peg$literalExpectation("amount", true);
+  var peg$e11 = peg$literalExpectation("merchant", true);
+  var peg$e12 = peg$literalExpectation("description", true);
+  var peg$e13 = peg$literalExpectation("reportid", true);
+  var peg$e14 = peg$literalExpectation("report-id", true);
+  var peg$e15 = peg$literalExpectation("keyword", true);
+  var peg$e16 = peg$literalExpectation("in", true);
+  var peg$e17 = peg$literalExpectation("currency", true);
+  var peg$e18 = peg$literalExpectation("groupCurrency", false);
+  var peg$e19 = peg$literalExpectation("group-currency", true);
+  var peg$e20 = peg$literalExpectation("tag", true);
+  var peg$e21 = peg$literalExpectation("category", true);
+  var peg$e22 = peg$literalExpectation("to", true);
+  var peg$e23 = peg$literalExpectation("exporter", true);
+  var peg$e24 = peg$literalExpectation("payer", true);
+  var peg$e25 = peg$literalExpectation("taxRate", true);
+  var peg$e26 = peg$literalExpectation("tax-rate", true);
+  var peg$e27 = peg$literalExpectation("cardID", false);
+  var peg$e28 = peg$literalExpectation("card", true);
+  var peg$e29 = peg$literalExpectation("from", true);
+  var peg$e30 = peg$literalExpectation("attendee", true);
+  var peg$e31 = peg$literalExpectation("expenseType", false);
+  var peg$e32 = peg$literalExpectation("expense-type", true);
+  var peg$e33 = peg$literalExpectation("withdrawalType", false);
+  var peg$e34 = peg$literalExpectation("withdrawal-type", true);
+  var peg$e35 = peg$literalExpectation("withdrawalID", true);
+  var peg$e36 = peg$literalExpectation("withdrawal-id", true);
+  var peg$e37 = peg$literalExpectation("billable", true);
+  var peg$e38 = peg$literalExpectation("reimbursable", true);
+  var peg$e39 = peg$literalExpectation("type", true);
+  var peg$e40 = peg$literalExpectation("status", true);
+  var peg$e41 = peg$literalExpectation("sortBy", false);
+  var peg$e42 = peg$literalExpectation("sort-by", true);
+  var peg$e43 = peg$literalExpectation("sortOrder", false);
+  var peg$e44 = peg$literalExpectation("sort-order", true);
+  var peg$e45 = peg$literalExpectation("policyID", false);
+  var peg$e46 = peg$literalExpectation("workspace", true);
+  var peg$e47 = peg$literalExpectation("submitted", true);
+  var peg$e48 = peg$literalExpectation("approved", true);
+  var peg$e49 = peg$literalExpectation("paid", true);
+  var peg$e50 = peg$literalExpectation("exported", true);
+  var peg$e51 = peg$literalExpectation("posted", true);
+  var peg$e52 = peg$literalExpectation("withdrawn", true);
+  var peg$e53 = peg$literalExpectation("groupBy", true);
+  var peg$e54 = peg$literalExpectation("group-by", true);
+  var peg$e55 = peg$literalExpectation("limit", true);
+  var peg$e56 = peg$literalExpectation("feed", true);
+  var peg$e57 = peg$literalExpectation("title", true);
+  var peg$e58 = peg$literalExpectation("assignee", true);
+  var peg$e59 = peg$literalExpectation("createdBy", true);
+  var peg$e60 = peg$literalExpectation("created-by", true);
+  var peg$e61 = peg$literalExpectation("action", true);
+  var peg$e62 = peg$literalExpectation("total", true);
+  var peg$e63 = peg$literalExpectation("has", true);
+  var peg$e64 = peg$literalExpectation("is", true);
+  var peg$e65 = peg$literalExpectation("purchaseAmount", true);
+  var peg$e66 = peg$literalExpectation("purchase-amount", true);
+  var peg$e67 = peg$literalExpectation("purchaseCurrency", true);
+  var peg$e68 = peg$literalExpectation("purchase-currency", true);
+  var peg$e69 = peg$literalExpectation("columns", true);
+  var peg$e70 = peg$literalExpectation("view", true);
+  var peg$e71 = peg$literalExpectation("per-diem", true);
+  var peg$e72 = peg$literalExpectation("drafts", true);
+  var peg$e73 = peg$literalExpectation("draft", true);
+  var peg$e74 = peg$literalExpectation("original-amount", true);
+  var peg$e75 = peg$literalExpectation("tax", true);
+  var peg$e76 = peg$literalExpectation("policy-name", true);
+  var peg$e77 = peg$literalExpectation("bank-account", true);
+  var peg$e78 = peg$literalExpectation("long-report-id", true);
+  var peg$e79 = peg$literalExpectation("exported-to", true);
+  var peg$e80 = peg$classExpectation([":", "="], false, false);
+  var peg$e81 = peg$literalExpectation("exportedTo", true);
+  var peg$e82 = peg$literalExpectation("exchange-rate", true);
+  var peg$e83 = peg$literalExpectation("reimbursable-total", true);
+  var peg$e84 = peg$literalExpectation("non-reimbursable-total", true);
+  var peg$e85 = peg$literalExpectation("group-from", true);
+  var peg$e86 = peg$literalExpectation("group-expenses", true);
+  var peg$e87 = peg$literalExpectation("group-total", true);
+  var peg$e88 = peg$literalExpectation("group-card", true);
+  var peg$e89 = peg$literalExpectation("group-feed", true);
+  var peg$e90 = peg$literalExpectation("group-bank-account", true);
+  var peg$e91 = peg$literalExpectation("group-withdrawn", true);
+  var peg$e92 = peg$literalExpectation("group-withdrawal-id", true);
+  var peg$e93 = peg$literalExpectation("group-category", true);
+  var peg$e94 = peg$literalExpectation("group-tag", true);
+  var peg$e95 = peg$literalExpectation("group-merchant", true);
+  var peg$e96 = peg$literalExpectation("group-month", true);
+  var peg$e97 = peg$literalExpectation("group-week", true);
+  var peg$e98 = peg$literalExpectation("group-year", true);
+  var peg$e99 = peg$literalExpectation("group-quarter", true);
+  var peg$e100 = peg$otherExpectation("operator");
+  var peg$e101 = peg$literalExpectation("*:", false);
+  var peg$e102 = peg$literalExpectation("!=", false);
+  var peg$e103 = peg$literalExpectation(">=", false);
+  var peg$e104 = peg$literalExpectation(">", false);
+  var peg$e105 = peg$literalExpectation("<=", false);
+  var peg$e106 = peg$literalExpectation("<", false);
+  var peg$e107 = peg$otherExpectation("word");
+  var peg$e108 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e109 = peg$otherExpectation("whitespace");
+  var peg$e110 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
+  var peg$e111 = peg$otherExpectation("quote");
+  var peg$e112 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e113 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
+  var peg$e114 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
+  var peg$e115 = peg$literalExpectation("\u201C", false);
+  var peg$e116 = peg$literalExpectation("\u201D", false);
+  var peg$e117 = peg$literalExpectation("\"", false);
+  var peg$e118 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e119 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e120 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
+  var peg$e121 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
+  var peg$e122 = peg$classExpectation([","], false, false);
+  var peg$e123 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false);
+
+  var peg$f0 = function(filters) { return applyDefaults(filters); };
+  var peg$f1 = function(head, tail) {
+      const allFilters = [head, ...tail.map(([_, filter]) => filter)]
+        .filter(Boolean)
+        .filter((filter) => filter.right);
+      rawFilterList = allFilters.map(createRawFilter).filter(Boolean);
+
+      const filtersWithoutDefaults = allFilters.filter((filter) => !filter.isDefault);
+
+      if (!filtersWithoutDefaults.length) {
+        return null;
+      }
+
+      const keywords = filtersWithoutDefaults.filter(
+        (filter) =>
+          filter.left === "keyword" || filter.right?.left === "keyword"
+      );
+      const nonKeywords = filtersWithoutDefaults.filter(
+        (filter) =>
+          filter.left !== "keyword" && filter.right?.left !== "keyword"
+      );
+
+      const keywordFilter = buildFilter(
+        "eq",
+        "keyword",
+        keywords
+          .map((filter) => filter.right.replaceAll(/^(['"])(.*)\1$/g, "$2"))
+          .flat()
+      );
+      if (keywordFilter.right.length > 0) {
+        nonKeywords.push(keywordFilter);
+      }
+      return nonKeywords.reduce((result, filter) =>
+        buildFilter("and", result, filter)
+      );
+    };
+  var peg$f2 = function(key, op, value) {
+      updateDefaultValues(key, value);
+      return {...buildFilter(op, key, value), isDefault: true};
+    };
+  var peg$f3 = function(value) {
+      //handle no-breaking space
+      let word;
+      if (Array.isArray(value)) {
+        word = value.join("");
+      } else {
+        word = value;
+      }
+      return buildFilter("eq", "keyword", word);
+    };
+  var peg$f4 = function(neg, field, op, values) {
+      expectingNestedQuote = false; nameOperator = false;
 
-    const key = field;
-    let operator = op;
+      const key = field;
+      let operator = op;
 
-    // Apply negation only when "-" is present and the key can be negated
-    if (neg && !nonNegatableKeys.has(key)) {
-      if (operator === "eq") {
-        operator = "neq";
+      // Apply negation only when "-" is present and the key can be negated
+      if (neg && !nonNegatableKeys.has(key)) {
+        if (operator === "eq") {
+          operator = "neq";
+        }
       }
-    }
 
-    return buildFilter(operator, key, values);
-  }
-  function peg$f5(rest) {
-    const suffix = rest.replaceAll(/^-+/g, "");
-    return "reportField-" + (suffix ? suffix : "");
-  }
-  function peg$f6(k) {
-    nameOperator = (k === "from" || k === "to" || k === "payer" || k === "exporter" || k === "attendee" || k === "createdBy" || k === "assignee");
-    return k;
-  }
-  function peg$f7(parts, empty) {
-    const value = parts.flat().filter(Boolean).map((word) => {
-      if (word.startsWith('"') && word.endsWith('"') && word.length >= 2) {
-        return word.slice(1, -1);
+      return buildFilter(operator, key, values);
+    };
+  var peg$f5 = function(rest) {
+      const suffix = rest.replaceAll(/^-+/g, "");
+      return "reportField-" + (suffix ? suffix : "");
+    };
+  var peg$f6 = function(k) {
+      nameOperator = (k === "from" || k === "to" || k === "payer" || k === "exporter" || k === "attendee" || k === "createdBy" || k === "assignee");
+      return k;
+    };
+  var peg$f7 = function(parts, empty) {
+      const value = parts.flat().filter(Boolean).map((word) => {
+        if (word.startsWith('"') && word.endsWith('"') && word.length >= 2) {
+          return word.slice(1, -1);
+        }
+        return word;
+      });
+      if (value.length > 1) {
+        return value.filter((word) => word.length > 0);
       }
-      return word;
-    });
-    if (value.length > 1) {
-      return value.filter((word) => word.length > 0);
-    }
-    return value[0];
-  }
-  function peg$f8() {    return "date";  }
-  function peg$f9() {    return "amount";  }
-  function peg$f10() {    return "merchant";  }
-  function peg$f11() {    return "description";  }
-  function peg$f12() {    return "reportID";  }
-  function peg$f13() {    return "keyword";  }
-  function peg$f14() {    return "in";  }
-  function peg$f15() {    return "currency";  }
-  function peg$f16() {    return "groupCurrency";  }
-  function peg$f17() {    return "tag";  }
-  function peg$f18() {    return "category";  }
-  function peg$f19() {    return "to";  }
-  function peg$f20() {    return "exporter";  }
-  function peg$f21() {    return "payer";  }
-  function peg$f22() {    return "taxRate";  }
-  function peg$f23() {    return "cardID";  }
-  function peg$f24() {    return "from";  }
-  function peg$f25() {return "attendee"  }
-  function peg$f26() {    return "expenseType";  }
-  function peg$f27() {    return "withdrawalType";  }
-  function peg$f28() {    return "withdrawalID";  }
-  function peg$f29() {    return "billable";  }
-  function peg$f30() {    return "reimbursable";  }
-  function peg$f31() {    return "type";  }
-  function peg$f32() {    return "status";  }
-  function peg$f33() {    return "sortBy";  }
-  function peg$f34() {    return "sortOrder";  }
-  function peg$f35() {    return "policyID";  }
-  function peg$f36() {    return "submitted";  }
-  function peg$f37() {    return "approved";  }
-  function peg$f38() {    return "paid";  }
-  function peg$f39() {    return "exported";  }
-  function peg$f40() {    return "posted";  }
-  function peg$f41() {    return "withdrawn";  }
-  function peg$f42() {    return "groupBy";  }
-  function peg$f43() {    return "limit";  }
-  function peg$f44() {    return "feed";  }
-  function peg$f45() {    return "title";  }
-  function peg$f46() {    return "assignee";  }
-  function peg$f47() {    return "createdBy";  }
-  function peg$f48() {    return "action";  }
-  function peg$f49() {return "total";  }
-  function peg$f50() {return "has";  }
-  function peg$f51() {return "is";  }
-  function peg$f52() {return "purchaseAmount"  }
-  function peg$f53() {return "purchaseCurrency"  }
-  function peg$f54() {
-    isColumnsContext = true;
-    return "columns";
-  }
-  function peg$f55() {return "view"  }
-  function peg$f56() {    return isColumnsContext;  }
-  function peg$f57() {    return "perDiem";  }
-  function peg$f58() {    return "drafts";  }
-  function peg$f59() {    return "originalamount";  }
-  function peg$f60() {    return "taxAmount";  }
-  function peg$f61() {    return "taxrate";  }
-  function peg$f62() {    return "policyname";  }
-  function peg$f63() {    return "withdrawalID";  }
-  function peg$f64() {    return "bankAccount";  }
-  function peg$f65() {    return "reportID";  }
-  function peg$f66() {    return "base62ReportID";  }
-  function peg$f67() {    return "exportedto";  }
-  function peg$f68() {    return "exportedTo";  }
-  function peg$f69() {    return "exportedTo";  }
-  function peg$f70() {    return "exchangeRate";  }
-  function peg$f71() {    return "reimbursableTotal";  }
-  function peg$f72() {    return "nonReimbursableTotal";  }
-  function peg$f73() {    return "groupFrom";  }
-  function peg$f74() {    return "groupExpenses";  }
-  function peg$f75() {    return "groupTotal";  }
-  function peg$f76() {    return "groupCard";  }
-  function peg$f77() {    return "groupFeed";  }
-  function peg$f78() {    return "groupBankAccount";  }
-  function peg$f79() {    return "groupWithdrawn";  }
-  function peg$f80() {    return "groupWithdrawalID";  }
-  function peg$f81() {    return "groupCategory";  }
-  function peg$f82() {    return "groupTag";  }
-  function peg$f83() {    return "groupMerchant";  }
-  function peg$f84() {    return "groupmonth";  }
-  function peg$f85() {    return "groupweek";  }
-  function peg$f86() {    return "groupyear";  }
-  function peg$f87() {    return "groupquarter";  }
-  function peg$f88() {    return "contains";  }
-  function peg$f89() {    return "eq";  }
-  function peg$f90() {    return "neq";  }
-  function peg$f91() {    return "gte";  }
-  function peg$f92() {    return "gt";  }
-  function peg$f93() {    return "lte";  }
-  function peg$f94() {    return "lt";  }
-  function peg$f95(o) {
-    if (nameOperator) {
-      expectingNestedQuote = (o === "eq" || o === "contains");
-    }
-    isColumnsContext = false;
-    return o;
-  }
-  function peg$f96(chars) {    return chars.join("").trim();  }
-  function peg$f97() {    
-     isColumnsContext = false;
-     return "and";
-  }
-  function peg$f98() {    return expectingNestedQuote;  }
-  function peg$f99(start, inner, end) {    //handle no-breaking space
-         return [...start, '"', ...inner, '"', ...end].join("");
-  }
-  function peg$f100(start) {return "“"  }
-  function peg$f101(start) {return "”"  }
-  function peg$f102(start) {return "\""  }
-  function peg$f103(start, inner, end) {
+      return value[0];
+    };
+  var peg$f8 = function() { return "date"; };
+  var peg$f9 = function() { return "amount"; };
+  var peg$f10 = function() { return "merchant"; };
+  var peg$f11 = function() { return "description"; };
+  var peg$f12 = function() { return "reportID"; };
+  var peg$f13 = function() { return "keyword"; };
+  var peg$f14 = function() { return "in"; };
+  var peg$f15 = function() { return "currency"; };
+  var peg$f16 = function() { return "groupCurrency"; };
+  var peg$f17 = function() { return "tag"; };
+  var peg$f18 = function() { return "category"; };
+  var peg$f19 = function() { return "to"; };
+  var peg$f20 = function() { return "exporter"; };
+  var peg$f21 = function() { return "payer"; };
+  var peg$f22 = function() { return "taxRate"; };
+  var peg$f23 = function() { return "cardID"; };
+  var peg$f24 = function() { return "from"; };
+  var peg$f25 = function() {return "attendee"};
+  var peg$f26 = function() { return "expenseType"; };
+  var peg$f27 = function() { return "withdrawalType"; };
+  var peg$f28 = function() { return "withdrawalID"; };
+  var peg$f29 = function() { return "billable"; };
+  var peg$f30 = function() { return "reimbursable"; };
+  var peg$f31 = function() { return "type"; };
+  var peg$f32 = function() { return "status"; };
+  var peg$f33 = function() { return "sortBy"; };
+  var peg$f34 = function() { return "sortOrder"; };
+  var peg$f35 = function() { return "policyID"; };
+  var peg$f36 = function() { return "submitted"; };
+  var peg$f37 = function() { return "approved"; };
+  var peg$f38 = function() { return "paid"; };
+  var peg$f39 = function() { return "exported"; };
+  var peg$f40 = function() { return "posted"; };
+  var peg$f41 = function() { return "withdrawn"; };
+  var peg$f42 = function() { return "groupBy"; };
+  var peg$f43 = function() { return "limit"; };
+  var peg$f44 = function() { return "feed"; };
+  var peg$f45 = function() { return "title"; };
+  var peg$f46 = function() { return "assignee"; };
+  var peg$f47 = function() { return "createdBy"; };
+  var peg$f48 = function() { return "action"; };
+  var peg$f49 = function() {return "total"; };
+  var peg$f50 = function() {return "has"; };
+  var peg$f51 = function() {return "is"; };
+  var peg$f52 = function() {return "purchaseAmount"};
+  var peg$f53 = function() {return "purchaseCurrency"};
+  var peg$f54 = function() {
+  isColumnsContext = true;
+  return "columns";
+};
+  var peg$f55 = function() {return "view"};
+  var peg$f56 = function() { return isColumnsContext; };
+  var peg$f57 = function() { return "perDiem"; };
+  var peg$f58 = function() { return "drafts"; };
+  var peg$f59 = function() { return "originalamount"; };
+  var peg$f60 = function() { return "taxAmount"; };
+  var peg$f61 = function() { return "taxrate"; };
+  var peg$f62 = function() { return "policyname"; };
+  var peg$f63 = function() { return "withdrawalID"; };
+  var peg$f64 = function() { return "bankAccount"; };
+  var peg$f65 = function() { return "reportID"; };
+  var peg$f66 = function() { return "base62ReportID"; };
+  var peg$f67 = function() { return "exportedto"; };
+  var peg$f68 = function() { return "exportedTo"; };
+  var peg$f69 = function() { return "exportedTo"; };
+  var peg$f70 = function() { return "exchangeRate"; };
+  var peg$f71 = function() { return "reimbursableTotal"; };
+  var peg$f72 = function() { return "nonReimbursableTotal"; };
+  var peg$f73 = function() { return "groupFrom"; };
+  var peg$f74 = function() { return "groupExpenses"; };
+  var peg$f75 = function() { return "groupTotal"; };
+  var peg$f76 = function() { return "groupCard"; };
+  var peg$f77 = function() { return "groupFeed"; };
+  var peg$f78 = function() { return "groupBankAccount"; };
+  var peg$f79 = function() { return "groupWithdrawn"; };
+  var peg$f80 = function() { return "groupWithdrawalID"; };
+  var peg$f81 = function() { return "groupCategory"; };
+  var peg$f82 = function() { return "groupTag"; };
+  var peg$f83 = function() { return "groupMerchant"; };
+  var peg$f84 = function() { return "groupmonth"; };
+  var peg$f85 = function() { return "groupweek"; };
+  var peg$f86 = function() { return "groupyear"; };
+  var peg$f87 = function() { return "groupquarter"; };
+  var peg$f88 = function() { return "contains"; };
+  var peg$f89 = function() { return "eq"; };
+  var peg$f90 = function() { return "neq"; };
+  var peg$f91 = function() { return "gte"; };
+  var peg$f92 = function() { return "gt"; };
+  var peg$f93 = function() { return "lte"; };
+  var peg$f94 = function() { return "lt"; };
+  var peg$f95 = function(o) {
+      if (nameOperator) {
+        expectingNestedQuote = (o === "eq" || o === "contains");
+      }
+      isColumnsContext = false;
+      return o;
+  };
+  var peg$f96 = function(chars) { return chars.join("").trim(); };
+  var peg$f97 = function() { 
+  isColumnsContext = false;
+  return "and";
+};
+  var peg$f98 = function() { return expectingNestedQuote; };
+  var peg$f99 = function(start, inner, end) { //handle no-breaking space
+      return [...start, '"', ...inner, '"', ...end].join("");
+    };
+  var peg$f100 = function(start) {return "“"};
+  var peg$f101 = function(start) {return "”"};
+  var peg$f102 = function(start) {return "\""};
+  var peg$f103 = function(start, inner, end) {
     return [...start, '"', ...inner, '"'].join("");
-  }
-  let peg$currPos = options.peg$currPos | 0;
-  let peg$savedPos = peg$currPos;
-  const peg$posDetailsCache = [{ line: 1, column: 1 }];
-  let peg$maxFailPos = peg$currPos;
-  let peg$maxFailExpected = options.peg$maxFailExpected || [];
-  let peg$silentFails = options.peg$silentFails | 0;
+};
+  var peg$currPos = options.peg$currPos | 0;
+  var peg$savedPos = peg$currPos;
+  var peg$posDetailsCache = [{ line: 1, column: 1 }];
+  var peg$maxFailPos = peg$currPos;
+  var peg$maxFailExpected = options.peg$maxFailExpected || [];
+  var peg$silentFails = options.peg$silentFails | 0;
 
-  let peg$result;
+  var peg$result;
 
   if (options.startRule) {
     if (!(options.startRule in peg$startRuleFunctions)) {
@@ -642,7 +654,7 @@ function peg$parse(input, options) {
     return {
       source: peg$source,
       start: peg$savedPos,
-      end: peg$currPos,
+      end: peg$currPos
     };
   }
 
@@ -670,20 +682,12 @@ function peg$parse(input, options) {
     throw peg$buildSimpleError(message, location);
   }
 
-  function peg$getUnicode(pos = peg$currPos) {
-    const cp = input.codePointAt(pos);
-    if (cp === undefined) {
-      return "";
-    }
-    return String.fromCodePoint(cp);
-  }
-
   function peg$literalExpectation(text, ignoreCase) {
-    return { type: "literal", text, ignoreCase };
+    return { type: "literal", text: text, ignoreCase: ignoreCase };
   }
 
-  function peg$classExpectation(parts, inverted, ignoreCase, unicode) {
-    return { type: "class", parts, inverted, ignoreCase, unicode };
+  function peg$classExpectation(parts, inverted, ignoreCase) {
+    return { type: "class", parts: parts, inverted: inverted, ignoreCase: ignoreCase };
   }
 
   function peg$anyExpectation() {
@@ -695,12 +699,12 @@ function peg$parse(input, options) {
   }
 
   function peg$otherExpectation(description) {
-    return { type: "other", description };
+    return { type: "other", description: description };
   }
 
   function peg$computePosDetails(pos) {
-    let details = peg$posDetailsCache[pos];
-    let p;
+    var details = peg$posDetailsCache[pos];
+    var p;
 
     if (details) {
       return details;
@@ -715,7 +719,7 @@ function peg$parse(input, options) {
       details = peg$posDetailsCache[p];
       details = {
         line: details.line,
-        column: details.column,
+        column: details.column
       };
 
       while (p < pos) {
@@ -736,21 +740,21 @@ function peg$parse(input, options) {
   }
 
   function peg$computeLocation(startPos, endPos, offset) {
-    const startPosDetails = peg$computePosDetails(startPos);
-    const endPosDetails = peg$computePosDetails(endPos);
+    var startPosDetails = peg$computePosDetails(startPos);
+    var endPosDetails = peg$computePosDetails(endPos);
 
-    const res = {
+    var res = {
       source: peg$source,
       start: {
         offset: startPos,
         line: startPosDetails.line,
-        column: startPosDetails.column,
+        column: startPosDetails.column
       },
       end: {
         offset: endPos,
         line: endPosDetails.line,
-        column: endPosDetails.column,
-      },
+        column: endPosDetails.column
+      }
     };
     if (offset && peg$source && (typeof peg$source.offset === "function")) {
       res.start = peg$source.offset(res.start);
@@ -784,7 +788,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsequery() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -800,7 +804,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterList() {
-    let s0, s1, s2, s3, s4, s5;
+    var s0, s1, s2, s3, s4, s5;
 
     s0 = peg$currPos;
     s1 = peg$parsefilter();
@@ -840,7 +844,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilter() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parsestandardFilter();
@@ -861,7 +865,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedefaultFilter() {
-    let s0, s1, s2, s3, s4, s5, s6;
+    var s0, s1, s2, s3, s4, s5, s6;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -892,7 +896,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefreeTextFilter() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -934,7 +938,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsestandardFilter() {
-    let s0, s1, s2, s3, s4, s5, s6, s7;
+    var s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -975,12 +979,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportFieldDynamic() {
-    let s0, s1, s2, s3, s4, s5, s6, s7;
+    var s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
     if (s1.toLowerCase() === peg$c1) {
-      peg$currPos += (12);
+      peg$currPos += 12;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e2); }
@@ -988,7 +992,7 @@ function peg$parse(input, options) {
     if (s1 === peg$FAILED) {
       s1 = input.substr(peg$currPos, 11);
       if (s1.toLowerCase() === peg$c2) {
-        peg$currPos += (11);
+        peg$currPos += 11;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e3); }
@@ -1096,7 +1100,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsekey() {
-    let s0, s1;
+    var s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -1237,7 +1241,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterKey() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parsekey();
@@ -1251,7 +1255,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedefaultKey() {
-    let s0, s1;
+    var s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -1296,7 +1300,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseidentifier() {
-    let s0, s1, s2, s3, s4, s5, s6;
+    var s0, s1, s2, s3, s4, s5, s6;
 
     s0 = peg$currPos;
     s1 = [];
@@ -1419,12 +1423,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedate() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c4) {
-      peg$currPos += (4);
+      peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e9); }
@@ -1439,12 +1443,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseamount() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c5) {
-      peg$currPos += (6);
+      peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e10); }
@@ -1459,12 +1463,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsemerchant() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c6) {
-      peg$currPos += (8);
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e11); }
@@ -1479,12 +1483,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedescription() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c7) {
-      peg$currPos += (11);
+      peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e12); }
@@ -1499,11 +1503,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportID() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = input.substr(peg$currPos, 8);
     if (s0.toLowerCase() === peg$c8) {
-      peg$currPos += (8);
+      peg$currPos += 8;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e13); }
@@ -1512,7 +1516,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 9);
       if (s1.toLowerCase() === peg$c9) {
-        peg$currPos += (9);
+        peg$currPos += 9;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e14); }
@@ -1528,12 +1532,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsekeyword() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 7);
     if (s1.toLowerCase() === peg$c10) {
-      peg$currPos += (7);
+      peg$currPos += 7;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e15); }
@@ -1548,12 +1552,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsein() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
     if (s1.toLowerCase() === peg$c11) {
-      peg$currPos += (2);
+      peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e16); }
@@ -1568,12 +1572,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecurrency() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c12) {
-      peg$currPos += (8);
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e17); }
@@ -1588,7 +1592,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupCurrency() {
-    let s0, s1;
+    var s0, s1;
 
     if (input.substr(peg$currPos, 13) === peg$c13) {
       s0 = peg$c13;
@@ -1601,7 +1605,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 14);
       if (s1.toLowerCase() === peg$c14) {
-        peg$currPos += (14);
+        peg$currPos += 14;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e19); }
@@ -1617,12 +1621,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetag() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
     if (s1.toLowerCase() === peg$c15) {
-      peg$currPos += (3);
+      peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e20); }
@@ -1637,12 +1641,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecategory() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c16) {
-      peg$currPos += (8);
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e21); }
@@ -1657,12 +1661,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseto() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
     if (s1.toLowerCase() === peg$c17) {
-      peg$currPos += (2);
+      peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e22); }
@@ -1677,12 +1681,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexporter() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c18) {
-      peg$currPos += (8);
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e23); }
@@ -1697,12 +1701,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepayer() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
     if (s1.toLowerCase() === peg$c19) {
-      peg$currPos += (5);
+      peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e24); }
@@ -1717,11 +1721,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetaxRate() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
     if (s0.toLowerCase() === peg$c20) {
-      peg$currPos += (7);
+      peg$currPos += 7;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e25); }
@@ -1730,7 +1734,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
       if (s1.toLowerCase() === peg$c21) {
-        peg$currPos += (8);
+        peg$currPos += 8;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e26); }
@@ -1746,7 +1750,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecardID() {
-    let s0, s1;
+    var s0, s1;
 
     if (input.substr(peg$currPos, 6) === peg$c22) {
       s0 = peg$c22;
@@ -1759,7 +1763,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 4);
       if (s1.toLowerCase() === peg$c23) {
-        peg$currPos += (4);
+        peg$currPos += 4;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e28); }
@@ -1775,12 +1779,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefrom() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c24) {
-      peg$currPos += (4);
+      peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e29); }
@@ -1795,12 +1799,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseattendee() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c25) {
-      peg$currPos += (8);
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e30); }
@@ -1815,7 +1819,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexpenseType() {
-    let s0, s1;
+    var s0, s1;
 
     if (input.substr(peg$currPos, 11) === peg$c26) {
       s0 = peg$c26;
@@ -1828,7 +1832,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 12);
       if (s1.toLowerCase() === peg$c27) {
-        peg$currPos += (12);
+        peg$currPos += 12;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e32); }
@@ -1844,7 +1848,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalType() {
-    let s0, s1;
+    var s0, s1;
 
     if (input.substr(peg$currPos, 14) === peg$c28) {
       s0 = peg$c28;
@@ -1857,7 +1861,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 15);
       if (s1.toLowerCase() === peg$c29) {
-        peg$currPos += (15);
+        peg$currPos += 15;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e34); }
@@ -1873,11 +1877,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalID() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = input.substr(peg$currPos, 12);
     if (s0.toLowerCase() === peg$c30) {
-      peg$currPos += (12);
+      peg$currPos += 12;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e35); }
@@ -1886,7 +1890,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 13);
       if (s1.toLowerCase() === peg$c31) {
-        peg$currPos += (13);
+        peg$currPos += 13;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e36); }
@@ -1902,12 +1906,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsebillable() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c32) {
-      peg$currPos += (8);
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e37); }
@@ -1922,12 +1926,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereimbursable() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
     if (s1.toLowerCase() === peg$c33) {
-      peg$currPos += (12);
+      peg$currPos += 12;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e38); }
@@ -1942,12 +1946,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetype() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c34) {
-      peg$currPos += (4);
+      peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e39); }
@@ -1962,12 +1966,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsestatus() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c35) {
-      peg$currPos += (6);
+      peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e40); }
@@ -1982,7 +1986,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesortBy() {
-    let s0, s1;
+    var s0, s1;
 
     if (input.substr(peg$currPos, 6) === peg$c36) {
       s0 = peg$c36;
@@ -1995,7 +1999,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 7);
       if (s1.toLowerCase() === peg$c37) {
-        peg$currPos += (7);
+        peg$currPos += 7;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e42); }
@@ -2011,7 +2015,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesortOrder() {
-    let s0, s1;
+    var s0, s1;
 
     if (input.substr(peg$currPos, 9) === peg$c38) {
       s0 = peg$c38;
@@ -2024,7 +2028,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 10);
       if (s1.toLowerCase() === peg$c39) {
-        peg$currPos += (10);
+        peg$currPos += 10;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e44); }
@@ -2040,7 +2044,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepolicyID() {
-    let s0, s1;
+    var s0, s1;
 
     if (input.substr(peg$currPos, 8) === peg$c40) {
       s0 = peg$c40;
@@ -2053,7 +2057,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 9);
       if (s1.toLowerCase() === peg$c41) {
-        peg$currPos += (9);
+        peg$currPos += 9;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e46); }
@@ -2069,12 +2073,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesubmitted() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
     if (s1.toLowerCase() === peg$c42) {
-      peg$currPos += (9);
+      peg$currPos += 9;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e47); }
@@ -2089,12 +2093,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseapproved() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c43) {
-      peg$currPos += (8);
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e48); }
@@ -2109,12 +2113,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepaid() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c44) {
-      peg$currPos += (4);
+      peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e49); }
@@ -2129,12 +2133,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexported() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c45) {
-      peg$currPos += (8);
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e50); }
@@ -2149,12 +2153,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseposted() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c46) {
-      peg$currPos += (6);
+      peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e51); }
@@ -2169,12 +2173,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawn() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
     if (s1.toLowerCase() === peg$c47) {
-      peg$currPos += (9);
+      peg$currPos += 9;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e52); }
@@ -2189,11 +2193,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupBy() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
     if (s0.toLowerCase() === peg$c48) {
-      peg$currPos += (7);
+      peg$currPos += 7;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e53); }
@@ -2202,7 +2206,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
       if (s1.toLowerCase() === peg$c49) {
-        peg$currPos += (8);
+        peg$currPos += 8;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e54); }
@@ -2218,12 +2222,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parselimit() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
     if (s1.toLowerCase() === peg$c50) {
-      peg$currPos += (5);
+      peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e55); }
@@ -2238,12 +2242,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefeed() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c51) {
-      peg$currPos += (4);
+      peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e56); }
@@ -2258,12 +2262,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetitle() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
     if (s1.toLowerCase() === peg$c52) {
-      peg$currPos += (5);
+      peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e57); }
@@ -2278,12 +2282,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseassignee() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c53) {
-      peg$currPos += (8);
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e58); }
@@ -2298,11 +2302,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecreatedBy() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = input.substr(peg$currPos, 9);
     if (s0.toLowerCase() === peg$c54) {
-      peg$currPos += (9);
+      peg$currPos += 9;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e59); }
@@ -2311,7 +2315,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 10);
       if (s1.toLowerCase() === peg$c55) {
-        peg$currPos += (10);
+        peg$currPos += 10;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e60); }
@@ -2327,12 +2331,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseaction() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c56) {
-      peg$currPos += (6);
+      peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e61); }
@@ -2347,12 +2351,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetotal() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
     if (s1.toLowerCase() === peg$c57) {
-      peg$currPos += (5);
+      peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e62); }
@@ -2367,12 +2371,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsehas() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
     if (s1.toLowerCase() === peg$c58) {
-      peg$currPos += (3);
+      peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e63); }
@@ -2387,12 +2391,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseis() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
     if (s1.toLowerCase() === peg$c59) {
-      peg$currPos += (2);
+      peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e64); }
@@ -2407,11 +2411,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepurchaseAmount() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = input.substr(peg$currPos, 14);
     if (s0.toLowerCase() === peg$c60) {
-      peg$currPos += (14);
+      peg$currPos += 14;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e65); }
@@ -2420,7 +2424,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 15);
       if (s1.toLowerCase() === peg$c61) {
-        peg$currPos += (15);
+        peg$currPos += 15;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e66); }
@@ -2436,11 +2440,11 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepurchaseCurrency() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = input.substr(peg$currPos, 16);
     if (s0.toLowerCase() === peg$c62) {
-      peg$currPos += (16);
+      peg$currPos += 16;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e67); }
@@ -2449,7 +2453,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 17);
       if (s1.toLowerCase() === peg$c63) {
-        peg$currPos += (17);
+        peg$currPos += 17;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e68); }
@@ -2465,12 +2469,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecolumns() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 7);
     if (s1.toLowerCase() === peg$c64) {
-      peg$currPos += (7);
+      peg$currPos += 7;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e69); }
@@ -2485,12 +2489,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseview() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
     if (s1.toLowerCase() === peg$c65) {
-      peg$currPos += (4);
+      peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e70); }
@@ -2505,7 +2509,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsevalues() {
-    let s0, s1, s2;
+    var s0, s1, s2;
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
@@ -2539,7 +2543,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecolumnsValues() {
-    let s0;
+    var s0;
 
     s0 = peg$parseoriginalAmount();
     if (s0 === peg$FAILED) {
@@ -2625,12 +2629,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseperDiem() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c66) {
-      peg$currPos += (8);
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e71); }
@@ -2662,12 +2666,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedraft() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c67) {
-      peg$currPos += (6);
+      peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e72); }
@@ -2675,7 +2679,7 @@ function peg$parse(input, options) {
     if (s1 === peg$FAILED) {
       s1 = input.substr(peg$currPos, 5);
       if (s1.toLowerCase() === peg$c68) {
-        peg$currPos += (5);
+        peg$currPos += 5;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e73); }
@@ -2708,12 +2712,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseoriginalAmount() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 15);
     if (s1.toLowerCase() === peg$c69) {
-      peg$currPos += (15);
+      peg$currPos += 15;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e74); }
@@ -2745,12 +2749,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetaxAmount() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
     if (s1.toLowerCase() === peg$c70) {
-      peg$currPos += (3);
+      peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e75); }
@@ -2782,12 +2786,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetaxRateValue() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c21) {
-      peg$currPos += (8);
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e26); }
@@ -2819,12 +2823,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsepolicyName() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c71) {
-      peg$currPos += (11);
+      peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e76); }
@@ -2856,12 +2860,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewithdrawalId() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 13);
     if (s1.toLowerCase() === peg$c31) {
-      peg$currPos += (13);
+      peg$currPos += 13;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e36); }
@@ -2893,12 +2897,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsebankAccount() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
     if (s1.toLowerCase() === peg$c72) {
-      peg$currPos += (12);
+      peg$currPos += 12;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e77); }
@@ -2930,12 +2934,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereportId() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
     if (s1.toLowerCase() === peg$c73) {
-      peg$currPos += (14);
+      peg$currPos += 14;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e78); }
@@ -2967,12 +2971,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsebase62ReportId() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
     if (s1.toLowerCase() === peg$c9) {
-      peg$currPos += (9);
+      peg$currPos += 9;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e14); }
@@ -3004,12 +3008,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexportedToColumnValue() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c74) {
-      peg$currPos += (11);
+      peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e79); }
@@ -3041,7 +3045,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexportedToKeyEnd() {
-    let s0, s1, s2;
+    var s0, s1, s2;
 
     s0 = peg$parsewordBoundary();
     if (s0 === peg$FAILED) {
@@ -3067,12 +3071,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexportedTo() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c75) {
-      peg$currPos += (10);
+      peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e81); }
@@ -3103,7 +3107,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 11);
       if (s1.toLowerCase() === peg$c74) {
-        peg$currPos += (11);
+        peg$currPos += 11;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e79); }
@@ -3136,12 +3140,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexchangeRate() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 13);
     if (s1.toLowerCase() === peg$c76) {
-      peg$currPos += (13);
+      peg$currPos += 13;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e82); }
@@ -3173,12 +3177,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsereimbursableTotal() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 18);
     if (s1.toLowerCase() === peg$c77) {
-      peg$currPos += (18);
+      peg$currPos += 18;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e83); }
@@ -3210,12 +3214,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsenonReimbursableTotal() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 22);
     if (s1.toLowerCase() === peg$c78) {
-      peg$currPos += (22);
+      peg$currPos += 22;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e84); }
@@ -3247,12 +3251,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupFrom() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c79) {
-      peg$currPos += (10);
+      peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e85); }
@@ -3284,12 +3288,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupExpenses() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
     if (s1.toLowerCase() === peg$c80) {
-      peg$currPos += (14);
+      peg$currPos += 14;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e86); }
@@ -3321,12 +3325,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupTotal() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c81) {
-      peg$currPos += (11);
+      peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e87); }
@@ -3358,12 +3362,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupCard() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c82) {
-      peg$currPos += (10);
+      peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e88); }
@@ -3395,12 +3399,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupFeed() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c83) {
-      peg$currPos += (10);
+      peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e89); }
@@ -3432,12 +3436,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupBankAccount() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 18);
     if (s1.toLowerCase() === peg$c84) {
-      peg$currPos += (18);
+      peg$currPos += 18;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e90); }
@@ -3469,12 +3473,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupWithdrawn() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 15);
     if (s1.toLowerCase() === peg$c85) {
-      peg$currPos += (15);
+      peg$currPos += 15;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e91); }
@@ -3506,12 +3510,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupWithdrawalId() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 19);
     if (s1.toLowerCase() === peg$c86) {
-      peg$currPos += (19);
+      peg$currPos += 19;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e92); }
@@ -3543,12 +3547,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupCategory() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
     if (s1.toLowerCase() === peg$c87) {
-      peg$currPos += (14);
+      peg$currPos += 14;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e93); }
@@ -3580,12 +3584,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupTag() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
     if (s1.toLowerCase() === peg$c88) {
-      peg$currPos += (9);
+      peg$currPos += 9;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e94); }
@@ -3617,12 +3621,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupMerchant() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
     if (s1.toLowerCase() === peg$c89) {
-      peg$currPos += (14);
+      peg$currPos += 14;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e95); }
@@ -3654,12 +3658,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupMonth() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
     if (s1.toLowerCase() === peg$c90) {
-      peg$currPos += (11);
+      peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e96); }
@@ -3691,12 +3695,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupWeek() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c91) {
-      peg$currPos += (10);
+      peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e97); }
@@ -3728,12 +3732,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupYear() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
     if (s1.toLowerCase() === peg$c92) {
-      peg$currPos += (10);
+      peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e98); }
@@ -3765,12 +3769,12 @@ function peg$parse(input, options) {
   }
 
   function peg$parsegroupQuarter() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 13);
     if (s1.toLowerCase() === peg$c93) {
-      peg$currPos += (13);
+      peg$currPos += 13;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e99); }
@@ -3802,7 +3806,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseoperator() {
-    let s0, s1;
+    var s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -3918,7 +3922,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefilterOperator() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parseoperator();
@@ -3932,7 +3936,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsealphanumeric() {
-    let s0, s1, s2;
+    var s0, s1, s2;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -3973,7 +3977,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parselogicalAnd() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parse_();
@@ -3985,7 +3989,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parse_() {
-    let s0, s1;
+    var s0, s1;
 
     peg$silentFails++;
     s0 = [];
@@ -3994,7 +3998,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e109); }
+      if (peg$silentFails === 0) { peg$fail(peg$e110); }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
@@ -4003,16 +4007,18 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e109); }
+        if (peg$silentFails === 0) { peg$fail(peg$e110); }
       }
     }
     peg$silentFails--;
+    s1 = peg$FAILED;
+    if (peg$silentFails === 0) { peg$fail(peg$e109); }
 
     return s0;
   }
 
   function peg$parsequotedString() {
-    let s0, s1, s2;
+    var s0, s1, s2;
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
@@ -4043,7 +4049,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesimpleQuotedString() {
-    let s0, s1, s2, s3, s4, s5, s6;
+    var s0, s1, s2, s3, s4, s5, s6;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -4053,7 +4059,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e111); }
+      if (peg$silentFails === 0) { peg$fail(peg$e112); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -4062,7 +4068,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e111); }
+        if (peg$silentFails === 0) { peg$fail(peg$e112); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -4070,7 +4076,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e112); }
+      if (peg$silentFails === 0) { peg$fail(peg$e113); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -4079,7 +4085,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e113); }
+        if (peg$silentFails === 0) { peg$fail(peg$e114); }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
@@ -4088,7 +4094,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e113); }
+          if (peg$silentFails === 0) { peg$fail(peg$e114); }
         }
       }
       s4 = input.charAt(peg$currPos);
@@ -4096,7 +4102,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e112); }
+        if (peg$silentFails === 0) { peg$fail(peg$e113); }
       }
       if (s4 !== peg$FAILED) {
         s5 = [];
@@ -4130,14 +4136,14 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e110); }
+      if (peg$silentFails === 0) { peg$fail(peg$e111); }
     }
 
     return s0;
   }
 
   function peg$parsenestedQuotedString() {
-    let s0, s1, s2, s3, s4, s5, s6;
+    var s0, s1, s2, s3, s4, s5, s6;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -4147,7 +4153,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e111); }
+      if (peg$silentFails === 0) { peg$fail(peg$e112); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -4156,7 +4162,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e111); }
+        if (peg$silentFails === 0) { peg$fail(peg$e112); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -4164,7 +4170,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e112); }
+      if (peg$silentFails === 0) { peg$fail(peg$e113); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -4173,7 +4179,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e113); }
+        if (peg$silentFails === 0) { peg$fail(peg$e114); }
       }
       if (s4 === peg$FAILED) {
         s4 = peg$currPos;
@@ -4193,7 +4199,7 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e114); }
+            if (peg$silentFails === 0) { peg$fail(peg$e115); }
           }
           if (s6 !== peg$FAILED) {
             peg$savedPos = s4;
@@ -4224,7 +4230,7 @@ function peg$parse(input, options) {
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e115); }
+              if (peg$silentFails === 0) { peg$fail(peg$e116); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
@@ -4255,7 +4261,7 @@ function peg$parse(input, options) {
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e116); }
+                if (peg$silentFails === 0) { peg$fail(peg$e117); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
@@ -4278,7 +4284,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e113); }
+          if (peg$silentFails === 0) { peg$fail(peg$e114); }
         }
         if (s4 === peg$FAILED) {
           s4 = peg$currPos;
@@ -4298,7 +4304,7 @@ function peg$parse(input, options) {
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e114); }
+              if (peg$silentFails === 0) { peg$fail(peg$e115); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
@@ -4329,7 +4335,7 @@ function peg$parse(input, options) {
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e115); }
+                if (peg$silentFails === 0) { peg$fail(peg$e116); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
@@ -4360,7 +4366,7 @@ function peg$parse(input, options) {
                   peg$currPos++;
                 } else {
                   s6 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e116); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e117); }
                 }
                 if (s6 !== peg$FAILED) {
                   peg$savedPos = s4;
@@ -4392,14 +4398,14 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e110); }
+      if (peg$silentFails === 0) { peg$fail(peg$e111); }
     }
 
     return s0;
   }
 
   function peg$parseclosingQuote() {
-    let s0, s1, s2, s3;
+    var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.charAt(peg$currPos);
@@ -4407,7 +4413,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e112); }
+      if (peg$silentFails === 0) { peg$fail(peg$e113); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4436,7 +4442,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsevalidClosingCondition() {
-    let s0, s1, s2, s3, s4;
+    var s0, s1, s2, s3, s4;
 
     s0 = peg$currPos;
     s1 = [];
@@ -4445,7 +4451,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e117); }
+      if (peg$silentFails === 0) { peg$fail(peg$e118); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -4454,7 +4460,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e117); }
+        if (peg$silentFails === 0) { peg$fail(peg$e118); }
       }
     }
     s2 = [];
@@ -4463,7 +4469,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s3 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e118); }
+      if (peg$silentFails === 0) { peg$fail(peg$e119); }
     }
     while (s3 !== peg$FAILED) {
       s2.push(s3);
@@ -4472,7 +4478,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e118); }
+        if (peg$silentFails === 0) { peg$fail(peg$e119); }
       }
     }
     s3 = [];
@@ -4481,7 +4487,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s4 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e119); }
+      if (peg$silentFails === 0) { peg$fail(peg$e120); }
     }
     while (s4 !== peg$FAILED) {
       s3.push(s4);
@@ -4490,7 +4496,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e119); }
+        if (peg$silentFails === 0) { peg$fail(peg$e120); }
       }
     }
     s4 = peg$parseoperator();
@@ -4509,7 +4515,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e120); }
+        if (peg$silentFails === 0) { peg$fail(peg$e121); }
       }
       while (s2 !== peg$FAILED) {
         s1.push(s2);
@@ -4518,7 +4524,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e120); }
+          if (peg$silentFails === 0) { peg$fail(peg$e121); }
         }
       }
       s2 = peg$currPos;
@@ -4565,7 +4571,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e121); }
+          if (peg$silentFails === 0) { peg$fail(peg$e122); }
         }
       }
     }
@@ -4574,14 +4580,14 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewordBoundary() {
-    let s0, s1;
+    var s0, s1;
 
     s0 = input.charAt(peg$currPos);
     if (peg$r13.test(s0)) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e122); }
+      if (peg$silentFails === 0) { peg$fail(peg$e123); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
@@ -4761,35 +4767,29 @@ function peg$parse(input, options) {
 
   peg$result = peg$startRuleFunction();
 
-  const peg$success = (peg$result !== peg$FAILED && peg$currPos === input.length);
-  function peg$throw() {
-    if (peg$result !== peg$FAILED && peg$currPos < input.length) {
-      peg$fail(peg$endExpectation());
-    }
-
-    throw peg$buildStructuredError(
-      peg$maxFailExpected,
-      peg$maxFailPos < input.length ? peg$getUnicode(peg$maxFailPos) : null,
-      peg$maxFailPos < input.length
-        ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1)
-        : peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
-    );
-  }
   if (options.peg$library) {
     return /** @type {any} */ ({
       peg$result,
       peg$currPos,
       peg$FAILED,
       peg$maxFailExpected,
-      peg$maxFailPos,
-      peg$success,
-      peg$throw: peg$success ? undefined : peg$throw,
+      peg$maxFailPos
     });
   }
-  if (peg$success) {
+  if (peg$result !== peg$FAILED && peg$currPos === input.length) {
     return peg$result;
   } else {
-    peg$throw();
+    if (peg$result !== peg$FAILED && peg$currPos < input.length) {
+      peg$fail(peg$endExpectation());
+    }
+
+    throw peg$buildStructuredError(
+      peg$maxFailExpected,
+      peg$maxFailPos < input.length ? input.charAt(peg$maxFailPos) : null,
+      peg$maxFailPos < input.length
+        ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1)
+        : peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
+    );
   }
 }
 

From c033992b00661b7c3b78f10f4b44ec59ea11f118 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Thu, 21 May 2026 13:47:33 +0700
Subject: [PATCH 04/38] chore(search): fix parser CI checks

---
 src/libs/SearchParser/baseRules.peggy     | 2 +-
 tests/unit/Search/SearchQueryUtilsTest.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/SearchParser/baseRules.peggy b/src/libs/SearchParser/baseRules.peggy
index 9b7c2dbf5136..27534cf1337c 100644
--- a/src/libs/SearchParser/baseRules.peggy
+++ b/src/libs/SearchParser/baseRules.peggy
@@ -179,7 +179,7 @@ filterOperator
 
 alphanumeric "word" = chars:[^ ,\t\n\r\xA0]+ { return chars.join("").trim(); } //handle no-breaking space
 
-logicalAnd = _ { 
+logicalAnd = _ {
   isColumnsContext = false;
   return "and";
 }
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index d867b2fae82f..a2b2973af823 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -2920,7 +2920,7 @@ describe('SearchQueryUtils', () => {
             expect(merchantNode.operator).toBe(CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
         });
 
-        it('should preserve group drilldown merchant exact match', () => {
+        it('should preserve group drill-down merchant exact match', () => {
             const queryJSON = buildSearchQueryJSON('type:expense merchant:I');
             if (!queryJSON) {
                 throw new Error('Expected queryJSON to be defined');

From 234ff702f184688ad91c126abd43fcdfbebae5bb Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Sat, 27 Jun 2026 05:48:16 +0700
Subject: [PATCH 05/38] feat(search): add merchant match type selector

Add an Equal to / Contains match-type selector under the Merchant
advanced filter (RHP page and popover).

- Default Equal to -> serializes as merchant:value; Contains -> merchant*:value
- Restore the operator from the query on reopen so saved searches round-trip
- Preserve negated merchant as eq (-merchant:value -> neq)
- Add dedicated search.filters.merchant translation keys (en source of truth)
- Unit tests for build and round-trip behavior
---
 .../SearchAdvancedFiltersContent.tsx          | 17 ++++--
 .../TextInputFilterContent.tsx                | 56 +++++++++++++++----
 .../TextInputFilterContentPopupWrapper.tsx    |  3 +-
 src/languages/en.ts                           |  5 ++
 src/libs/SearchQueryUtils.ts                  | 29 ++++++++--
 .../TextInputFilterContentPageWrapper.tsx     |  3 +-
 src/types/form/SearchAdvancedFiltersForm.ts   |  8 ++-
 tests/unit/Search/SearchQueryUtilsTest.ts     | 51 ++++++++++++++++-
 8 files changed, 145 insertions(+), 27 deletions(-)

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
index d4365dbb5518..37792e1245cb 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
@@ -3,6 +3,7 @@ import {isAmountFilterKey, isDateFilterKey} from '@libs/SearchUIUtils';
 import type {SearchFilter} from '@libs/SearchUIUtils';
 import CONST from '@src/CONST';
 import type {SearchAdvancedFiltersForm} from '@src/types/form';
+import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
 import type {FilterComponentsProps} from '..';
 import type {AmountFilterContentProps} from './AmountFilterContent';
 import type {CommonFilterContentProps} from './CommonFilterContent';
@@ -10,7 +11,7 @@ import type {DateFilterContentProps} from './DateFilterContent';
 import type {ReportFieldFilterContentProps} from './ReportFieldFilterContent';
 import type {TextInputFilterContentProps} from './TextInputFilterContent';
 
-type TextInputFilterContentWrapperProps = Pick<TextInputFilterContentProps, 'filterKey' | 'value' | 'onChange'>;
+type TextInputFilterContentWrapperProps = Pick<TextInputFilterContentProps, 'filterKey' | 'value' | 'merchantOperator' | 'onChange'>;
 type AmountFilterContentWrapperProps = Pick<AmountFilterContentProps, 'filterKey' | 'value' | 'onChange'>;
 type DateFilterContentWrapperProps = Pick<DateFilterContentProps, 'filterKey' | 'value' | 'hasFeed' | 'onChange'>;
 type ReportFieldFilterContentWrapperProps = Pick<ReportFieldFilterContentProps, 'values' | 'onChange'>;
@@ -38,9 +39,11 @@ function getFilterFormValue<K extends FilterComponentsProps['filterKey']>(filter
 
 function SearchAdvancedFiltersContent({filterKey, values, policyIDQuery, ready, components, onChange}: SearchAdvancedFiltersContentProps) {
     const {Text: TextFilter, Amount: AmountFilter, Date: DateFilter, ReportField: ReportFieldFilter, Common: CommonFilter} = components;
+    const isMerchantFilter = filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT;
+    const merchantOperator = values?.[FILTER_KEYS.MERCHANT_OPERATOR] ?? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO;
 
     if (
-        filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT ||
+        isMerchantFilter ||
         filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.DESCRIPTION ||
         filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.REPORT_ID ||
         filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.KEYWORD ||
@@ -49,10 +52,16 @@ function SearchAdvancedFiltersContent({filterKey, values, policyIDQuery, ready,
     ) {
         return (
             <TextFilter
-                key={filterKey}
+                key={`${filterKey}-${values?.[filterKey] ?? ''}-${isMerchantFilter ? merchantOperator : ''}`}
                 filterKey={filterKey}
                 value={values?.[filterKey]}
-                onChange={(newValue) => onChange({[filterKey]: newValue})}
+                merchantOperator={isMerchantFilter ? merchantOperator : undefined}
+                onChange={(newValue, newMerchantOperator) =>
+                    onChange({
+                        [filterKey]: newValue,
+                        ...(isMerchantFilter ? {[FILTER_KEYS.MERCHANT_OPERATOR]: newMerchantOperator ?? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO} : {}),
+                    })
+                }
             />
         );
     }
diff --git a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
index 71082b1d8ad6..a95b43b49c6b 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
@@ -2,9 +2,12 @@ import React, {useState} from 'react';
 import {View} from 'react-native';
 import type {StyleProp, ViewStyle} from 'react-native';
 import Button from '@components/Button';
+import RadioButtonWithLabel from '@components/RadioButtonWithLabel';
+import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import type CONST from '@src/CONST';
+import CONST from '@src/CONST';
+import type {MerchantMatchType} from '@src/types/form/SearchAdvancedFiltersForm';
 import FilterComponents from '..';
 
 type TextInputFilterContentProps = {
@@ -19,31 +22,60 @@ type TextInputFilterContentProps = {
     largeButton?: boolean;
     autoFocus?: boolean;
     style?: StyleProp<ViewStyle>;
-    onChange: (value: string | undefined) => void;
+    merchantOperator?: MerchantMatchType;
+    onChange: (value: string | undefined, merchantOperator?: MerchantMatchType) => void;
 };
 
-function TextInputFilterContent({filterKey, value: initialValue, autoFocus, largeButton, style, onChange}: TextInputFilterContentProps) {
+function TextInputFilterContent({filterKey, value: initialValue, autoFocus, largeButton, style, merchantOperator: initialMerchantOperator, onChange}: TextInputFilterContentProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const [value, setValue] = useState(initialValue);
+    const shouldShowMerchantMatchType = filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT;
+    const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(initialMerchantOperator ?? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
+    const merchantMatchTypeItems: Array<{value: MerchantMatchType; label: string}> = [
+        {
+            value: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+            label: translate('search.filters.merchant.equalTo'),
+        },
+        {
+            value: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+            label: translate('search.filters.merchant.contains'),
+        },
+    ];
 
     return (
         <View style={[styles.flex1, styles.justifyContentBetween, style]}>
-            <FilterComponents
-                value={value}
-                policyIDs={undefined}
-                filterKey={filterKey}
-                policyIDQuery={undefined}
-                autoFocus={autoFocus}
-                onChange={(v) => setValue(typeof v === 'string' ? v : undefined)}
-            />
+            <View>
+                <FilterComponents
+                    value={value}
+                    policyIDs={undefined}
+                    filterKey={filterKey}
+                    policyIDQuery={undefined}
+                    autoFocus={autoFocus}
+                    onChange={(v) => setValue(typeof v === 'string' ? v : undefined)}
+                />
+                {shouldShowMerchantMatchType && (
+                    <View style={[styles.mt4, styles.ph5]}>
+                        <Text style={[styles.textLabelSupporting, styles.mb2]}>{translate('search.filters.merchant.matchType')}</Text>
+                        {merchantMatchTypeItems.map((item) => (
+                            <RadioButtonWithLabel
+                                key={item.value}
+                                isChecked={item.value === merchantOperator}
+                                style={styles.optionRowCompact}
+                                onPress={() => setMerchantOperator(item.value)}
+                                label={item.label}
+                            />
+                        ))}
+                    </View>
+                )}
+            </View>
             <Button
                 style={[styles.ph5, styles.pb5]}
                 success
                 large={largeButton}
                 text={translate('common.confirm')}
                 pressOnEnter
-                onPress={() => onChange(value)}
+                onPress={() => onChange(value, shouldShowMerchantMatchType ? merchantOperator : undefined)}
             />
         </View>
     );
diff --git a/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/TextInputFilterContentPopupWrapper.tsx b/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/TextInputFilterContentPopupWrapper.tsx
index 3457b897b376..0df2f0712ea3 100644
--- a/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/TextInputFilterContentPopupWrapper.tsx
+++ b/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/TextInputFilterContentPopupWrapper.tsx
@@ -3,12 +3,13 @@ import type {TextInputFilterContentWrapperProps} from '@components/Search/Filter
 import TextInputFilterContent from '@components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-function TextInputFilterContentPopupWrapper({filterKey, value, onChange}: TextInputFilterContentWrapperProps) {
+function TextInputFilterContentPopupWrapper({filterKey, value, merchantOperator, onChange}: TextInputFilterContentWrapperProps) {
     const styles = useThemeStyles();
     return (
         <TextInputFilterContent
             filterKey={filterKey}
             value={value}
+            merchantOperator={merchantOperator}
             style={[styles.pt5]}
             onChange={onChange}
         />
diff --git a/src/languages/en.ts b/src/languages/en.ts
index e937737c3ae1..ee5199999f8d 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -8371,6 +8371,11 @@ const translations = {
                 },
                 equalTo: (amount?: string) => `Equal to ${amount ?? ''}`,
             },
+            merchant: {
+                matchType: 'Match type',
+                equalTo: 'Equal to',
+                contains: 'Contains',
+            },
             card: {
                 expensify: 'Expensify',
                 travelInvoicing: 'Travel invoicing',
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index eb3f62e5c5d2..3415d4f4abff 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -34,7 +34,16 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import SCREENS from '@src/SCREENS';
 import type {SearchAdvancedFiltersForm} from '@src/types/form';
 import FILTER_KEYS, {ALLOWED_TYPE_FILTERS, AMOUNT_FILTER_KEYS, DATE_FILTER_KEYS} from '@src/types/form/SearchAdvancedFiltersForm';
-import type {ExpenseTypeValue, ExpenseTypeValues, HasFilterValue, HasFilterValues, IsFilterValue, IsFilterValues, SearchAdvancedFiltersKey} from '@src/types/form/SearchAdvancedFiltersForm';
+import type {
+    ExpenseTypeValue,
+    ExpenseTypeValues,
+    HasFilterValue,
+    HasFilterValues,
+    IsFilterValue,
+    IsFilterValues,
+    MerchantMatchType,
+    SearchAdvancedFiltersKey,
+} from '@src/types/form/SearchAdvancedFiltersForm';
 import type * as OnyxTypes from '@src/types/onyx';
 import type {SearchDataTypes, SearchResultDataType} from '@src/types/onyx/SearchResults';
 import {getCardFeedsForDisplay} from './CardFeedUtils';
@@ -69,6 +78,12 @@ const operatorToCharMap = {
     [CONST.SEARCH.SYNTAX_OPERATORS.OR]: ' ' as const,
 };
 
+const DEFAULT_MERCHANT_OPERATOR = CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO;
+
+function getMerchantOperator(operator: MerchantMatchType | undefined): MerchantMatchType {
+    return operator === CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS ? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS : DEFAULT_MERCHANT_OPERATOR;
+}
+
 // Pre-computed validation Sets for buildFilterFormValuesFromQuery (avoids recreating per filter iteration)
 const VALID_EXPENSE_TYPES = new Set(Object.values(CONST.SEARCH.TRANSACTION_TYPE));
 const VALID_HAS_TYPES = new Set(Object.values(CONST.SEARCH.HAS_VALUES));
@@ -791,7 +806,7 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
     }
 
     // We separate type and status filters from other filters to maintain hashes consistency for saved searches
-    const {type, status, groupBy, view, columns, limit, ...otherFilters} = supportedFilterValues;
+    const {type, status, groupBy, view, columns, limit, [FILTER_KEYS.MERCHANT_OPERATOR]: merchantOperator, ...otherFilters} = supportedFilterValues;
     const filtersString: string[] = [];
 
     if (options?.sortBy) {
@@ -857,12 +872,9 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
             ) {
                 const keyInCorrectForm = (Object.keys(CONST.SEARCH.SYNTAX_FILTER_KEYS) as FilterKeys[]).find((key) => CONST.SEARCH.SYNTAX_FILTER_KEYS[key] === filterKey);
                 if (keyInCorrectForm) {
-                    // For merchant filters:
-                    // - Non-negated: use *: (contains) for partial matching
-                    // - Negated: use : (eq) so parser correctly converts to neq operator
                     const operator =
                         filterKey === FILTER_KEYS.MERCHANT && !isNegated
-                            ? operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS]
+                            ? operatorToCharMap[getMerchantOperator(merchantOperator)]
                             : operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO];
                     return `${prefix}${CONST.SEARCH.SYNTAX_FILTER_KEYS[keyInCorrectForm]}${operator}${sanitizeSearchValue(filterValue as string)}`;
                 }
@@ -1098,6 +1110,11 @@ function buildFilterFormValuesFromQuery(
         }
         if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT || filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.DESCRIPTION || filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.TITLE) {
             filtersForm[key as typeof filterKey] = filterValues.join(',');
+            if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT && !isNegated) {
+                filtersForm[FILTER_KEYS.MERCHANT_OPERATOR] = filterList.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS)
+                    ? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS
+                    : DEFAULT_MERCHANT_OPERATOR;
+            }
         }
         if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.ACTION) {
             const actionValue = filterValues.join(',');
diff --git a/src/pages/Search/SearchAdvancedFiltersContentPage/TextInputFilterContentPageWrapper.tsx b/src/pages/Search/SearchAdvancedFiltersContentPage/TextInputFilterContentPageWrapper.tsx
index 82eee048b215..4d3aeeff98ef 100644
--- a/src/pages/Search/SearchAdvancedFiltersContentPage/TextInputFilterContentPageWrapper.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersContentPage/TextInputFilterContentPageWrapper.tsx
@@ -2,11 +2,12 @@ import React from 'react';
 import type {TextInputFilterContentWrapperProps} from '@components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent';
 import TextInputFilterContent from '@components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent';
 
-function TextInputFilterContentPageWrapper({filterKey, value, onChange}: TextInputFilterContentWrapperProps) {
+function TextInputFilterContentPageWrapper({filterKey, value, merchantOperator, onChange}: TextInputFilterContentWrapperProps) {
     return (
         <TextInputFilterContent
             filterKey={filterKey}
             value={value}
+            merchantOperator={merchantOperator}
             autoFocus
             largeButton
             onChange={onChange}
diff --git a/src/types/form/SearchAdvancedFiltersForm.ts b/src/types/form/SearchAdvancedFiltersForm.ts
index 91887f8d83df..c01b3091c657 100644
--- a/src/types/form/SearchAdvancedFiltersForm.ts
+++ b/src/types/form/SearchAdvancedFiltersForm.ts
@@ -98,6 +98,7 @@ const FILTER_KEYS = {
 
     MERCHANT_NOT: 'merchantNot',
     MERCHANT: 'merchant',
+    MERCHANT_OPERATOR: 'merchantOperator',
 
     DESCRIPTION_NOT: 'descriptionNot',
     DESCRIPTION: 'description',
@@ -200,6 +201,7 @@ const ALLOWED_TYPE_FILTERS: Record<string, Set<string>> = {
         FILTER_KEYS.EXPENSE_TYPE_NOT,
         FILTER_KEYS.MERCHANT,
         FILTER_KEYS.MERCHANT_NOT,
+        FILTER_KEYS.MERCHANT_OPERATOR,
         FILTER_KEYS.DATE_ON,
         FILTER_KEYS.DATE_NOT,
         FILTER_KEYS.DATE_AFTER,
@@ -373,6 +375,7 @@ const ALLOWED_TYPE_FILTERS: Record<string, Set<string>> = {
         FILTER_KEYS.POLICY_ID,
         FILTER_KEYS.MERCHANT,
         FILTER_KEYS.MERCHANT_NOT,
+        FILTER_KEYS.MERCHANT_OPERATOR,
         FILTER_KEYS.DATE_ON,
         FILTER_KEYS.DATE_NOT,
         FILTER_KEYS.DATE_AFTER,
@@ -467,6 +470,7 @@ const ALLOWED_TYPE_FILTERS: Record<string, Set<string>> = {
         FILTER_KEYS.POLICY_ID,
         FILTER_KEYS.MERCHANT,
         FILTER_KEYS.MERCHANT_NOT,
+        FILTER_KEYS.MERCHANT_OPERATOR,
         FILTER_KEYS.DATE_ON,
         FILTER_KEYS.DATE_NOT,
         FILTER_KEYS.DATE_AFTER,
@@ -593,6 +597,7 @@ type IsFilterValues = IsFilterValue[];
 type BooleanValue = ValueOf<typeof CONST.SEARCH.BOOLEAN>;
 type ExpenseTypeValue = ValueOf<typeof CONST.SEARCH.TRANSACTION_TYPE>;
 type ExpenseTypeValues = ExpenseTypeValue[];
+type MerchantMatchType = typeof CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO | typeof CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS;
 
 type SearchAdvancedFiltersForm = Form<
     SearchAdvancedFiltersKey,
@@ -669,6 +674,7 @@ type SearchAdvancedFiltersForm = Form<
 
         [FILTER_KEYS.MERCHANT]: string;
         [FILTER_KEYS.MERCHANT_NOT]: string;
+        [FILTER_KEYS.MERCHANT_OPERATOR]: MerchantMatchType;
 
         [FILTER_KEYS.DESCRIPTION]: string;
         [FILTER_KEYS.DESCRIPTION_NOT]: string;
@@ -758,6 +764,6 @@ type SearchAdvancedFiltersForm = Form<
         Record<ReportFieldNegatedKey, string>
 >;
 
-export type {SearchAdvancedFiltersForm, SearchAdvancedFiltersKey, HasFilterValue, HasFilterValues, IsFilterValue, IsFilterValues, ExpenseTypeValue, ExpenseTypeValues};
+export type {SearchAdvancedFiltersForm, SearchAdvancedFiltersKey, HasFilterValue, HasFilterValues, IsFilterValue, IsFilterValues, ExpenseTypeValue, ExpenseTypeValues, MerchantMatchType};
 export default FILTER_KEYS;
 export {DATE_FILTER_KEYS, ALLOWED_TYPE_FILTERS, AMOUNT_FILTER_KEYS};
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index cd3adbe59668..02a2505a054f 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -226,7 +226,20 @@ describe('SearchQueryUtils', () => {
 
             const result = buildQueryStringFromFilterFormValues(filterValues);
 
-            expect(result).toEqual('type:expense policyID:67890 merchant*:Amazon description:Electronics laptop category:electronics,gadgets');
+            expect(result).toEqual('type:expense policyID:67890 merchant:Amazon description:Electronics laptop category:electronics,gadgets');
+        });
+
+        test('builds contains merchant query when merchant operator is contains', () => {
+            const filterValues: Partial<SearchAdvancedFiltersForm> = {
+                type: 'expense',
+                status: CONST.SEARCH.STATUS.EXPENSE.ALL,
+                merchant: 'Amazon',
+                merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+            };
+
+            const result = buildQueryStringFromFilterFormValues(filterValues);
+
+            expect(result).toEqual('type:expense merchant*:Amazon');
         });
 
         test('currencies and categories', () => {
@@ -495,7 +508,7 @@ describe('SearchQueryUtils', () => {
 
                 const result = buildQueryStringFromFilterFormValues(filterValues, {sortBy: 'amount', sortOrder: 'asc'});
 
-                expect(result).toEqual('sortBy:amount sortOrder:asc type:expense merchant*:Amazon limit:25');
+                expect(result).toEqual('sortBy:amount sortOrder:asc type:expense merchant:Amazon limit:25');
             });
 
             test('omits limit when not provided', () => {
@@ -863,6 +876,40 @@ describe('SearchQueryUtils', () => {
     });
 
     describe('buildFilterFormValuesFromQuery', () => {
+        test('restores exact merchant operator from query', () => {
+            const queryJSON = buildSearchQueryJSON('sortBy:date sortOrder:desc type:expense merchant:Uber');
+
+            if (!queryJSON) {
+                throw new Error('Failed to parse query string');
+            }
+
+            const result = buildFilterFormValuesFromQuery(queryJSON, {}, {}, {}, {}, {}, {}, {});
+
+            expect(result).toEqual({
+                type: 'expense',
+                status: CONST.SEARCH.STATUS.EXPENSE.ALL,
+                merchant: 'Uber',
+                merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+            });
+        });
+
+        test('restores contains merchant operator from query', () => {
+            const queryJSON = buildSearchQueryJSON('sortBy:date sortOrder:desc type:expense merchant*:Uber');
+
+            if (!queryJSON) {
+                throw new Error('Failed to parse query string');
+            }
+
+            const result = buildFilterFormValuesFromQuery(queryJSON, {}, {}, {}, {}, {}, {}, {});
+
+            expect(result).toEqual({
+                type: 'expense',
+                status: CONST.SEARCH.STATUS.EXPENSE.ALL,
+                merchant: 'Uber',
+                merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+            });
+        });
+
         test('category filter includes empty values', () => {
             const policyID = generatePolicyID();
             const queryString = 'sortBy:date sortOrder:desc type:expense category:none,Uncategorized,Maintenance';

From f5b67138ab75cacd65568d33741c15c9ebda55e2 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Sat, 27 Jun 2026 06:03:27 +0700
Subject: [PATCH 06/38] chore(i18n): generate locale translations for merchant
 match type keys

Translations for search.filters.merchant.{matchType,equalTo,contains}
generated for de, es, fr, it, ja, nl, pl, pt-BR, zh-hans.
---
 src/languages/de.ts      | 1 +
 src/languages/es.ts      | 2 +-
 src/languages/fr.ts      | 4 +++-
 src/languages/it.ts      | 1 +
 src/languages/ja.ts      | 1 +
 src/languages/nl.ts      | 1 +
 src/languages/pl.ts      | 1 +
 src/languages/pt-BR.ts   | 1 +
 src/languages/zh-hans.ts | 1 +
 9 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index 27f21933473b..2759feaa5128 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -8347,6 +8347,7 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Bezahlen',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Export',
             },
+            merchant: {matchType: 'Übereinstimmungstyp', equalTo: 'Gleich wie', contains: 'Enthält'},
         },
         display: {
             label: 'Anzeige',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 8c40e566d5ef..7d1f2d9cccf3 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -1763,7 +1763,6 @@ const translations: TranslationDeepObject<typeof en> = {
                 }
             },
             [CONST.NEXT_STEP.MESSAGE_KEY.WAITING_TO_MARK_AS_DONE]: (actor, actorType, _eta, _etaType) => {
-                // eslint-disable-next-line default-case
                 switch (actorType) {
                     case CONST.NEXT_STEP.ACTOR_TYPE.CURRENT_USER:
                         return `Esperando a que <strong>tú</strong> lo marques como listo.`;
@@ -8166,6 +8165,7 @@ ${amount} para ${merchant} - ${date}`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exportar',
             },
             reportField: (name, value) => `${name} es ${value}`,
+            merchant: {matchType: 'Tipo de coincidencia', equalTo: 'Igual a', contains: 'Contiene'},
         },
         chartTitles: {
             [CONST.SEARCH.GROUP_BY.FROM]: 'De',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 5b95484f7ba5..7ee7771f6935 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -1,6 +1,7 @@
 /**
  *   _____                      __         __
  *  / ___/__ ___  ___ _______ _/ /____ ___/ /
+ * / (_ / -_) _ \/ -_) __/ _ \`/ __/ -_) _  /
  * \___/\__/_//_/\__/_/  \_,_/\__/\__/\_,_/
  *
  * This file was automatically generated. Please consider these alternatives before manually editing it:
@@ -862,7 +863,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users: string) => `Cette discussion est avec ${users}.`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `C’est ici que <strong>${submitterDisplayName}</strong> soumettra des dépenses à <strong>${workspaceName}</strong>. Utilisez simplement le bouton +.`,
-        beginningOfChatHistoryPolicyExpenseChatTrack: 'C\u2019est ici que vous suivrez vos dépenses',
+        beginningOfChatHistoryPolicyExpenseChatTrack: 'C’est ici que vous suivrez vos dépenses',
         beginningOfChatHistorySelfDM: 'Ceci est votre espace personnel. Utilisez-le pour vos notes, tâches, brouillons et rappels.',
         beginningOfChatHistorySystemDM: 'Bienvenue ! Procédons à la configuration.',
         chatWithAccountManager: 'Discutez avec votre gestionnaire de compte ici',
@@ -8380,6 +8381,7 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Payer',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exporter',
             },
+            merchant: {matchType: 'Type de correspondance', equalTo: 'Égal à', contains: 'Contient'},
         },
         display: {
             label: 'Affichage',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index e2e74784ef3d..0e89d5a9a265 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -8336,6 +8336,7 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Paga',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Esporta',
             },
+            merchant: {matchType: 'Tipo di corrispondenza', equalTo: 'Uguale a', contains: 'Contiene'},
         },
         display: {
             label: 'Visualizza',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 0e0e69b707b4..d1c6964b0679 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -8239,6 +8239,7 @@ ${reportName}`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: '支払う',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'エクスポート',
             },
+            merchant: {matchType: 'マッチタイプ', equalTo: '等しい', contains: '含む'},
         },
         display: {
             label: '表示',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index bc07604c0eca..670ec6f3a78f 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -8303,6 +8303,7 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Betalen',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exporteren',
             },
+            merchant: {matchType: 'Overeenkomsttype', equalTo: 'Gelijk aan', contains: 'Bevat'},
         },
         display: {
             label: 'Weergave',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 06dceafe2c84..51e6376585a5 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -8297,6 +8297,7 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Zapłać',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Eksportuj',
             },
+            merchant: {matchType: 'Typ dopasowania', equalTo: 'Równe', contains: 'Zawiera'},
         },
         display: {
             label: 'Wyświetl',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 772b8bc3d855..07db96301344 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -8295,6 +8295,7 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Pagar',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exportar',
             },
+            merchant: {matchType: 'Tipo de correspondência', equalTo: 'Igual a', contains: 'Contém'},
         },
         display: {
             label: 'Exibir',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 18036ce4bfba..8ed2ff9dbb56 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -8076,6 +8076,7 @@ ${reportName}`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: '支付',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: '导出',
             },
+            merchant: {matchType: '匹配类型', equalTo: '等于', contains: '包含'},
         },
         display: {
             label: '显示',

From 24cc2e10a18508ffd5e827fbee2b8dbc596ab4d6 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Tue, 30 Jun 2026 14:46:09 +0700
Subject: [PATCH 07/38] fix: use SingleSelectListItem for merchant match type
 selector

Match the Amount filter pattern by rendering the Equal to / Contains
match-type options with SingleSelectListItem so the selection control
sits on the right side, instead of RadioButtonWithLabel on the left.

Addresses review feedback on PR #83733.
---
 .../TextInputFilterContent.tsx                | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
index a95b43b49c6b..0f1bb2b14a5e 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
@@ -2,7 +2,8 @@ import React, {useState} from 'react';
 import {View} from 'react-native';
 import type {StyleProp, ViewStyle} from 'react-native';
 import Button from '@components/Button';
-import RadioButtonWithLabel from '@components/RadioButtonWithLabel';
+import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelectListItem';
+import type {ListItem} from '@components/SelectionList/types';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -32,14 +33,16 @@ function TextInputFilterContent({filterKey, value: initialValue, autoFocus, larg
     const [value, setValue] = useState(initialValue);
     const shouldShowMerchantMatchType = filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT;
     const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(initialMerchantOperator ?? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
-    const merchantMatchTypeItems: Array<{value: MerchantMatchType; label: string}> = [
+    const merchantMatchTypeItems: Array<ListItem<MerchantMatchType>> = [
         {
-            value: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
-            label: translate('search.filters.merchant.equalTo'),
+            keyForList: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+            text: translate('search.filters.merchant.equalTo'),
+            isSelected: merchantOperator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
         },
         {
-            value: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
-            label: translate('search.filters.merchant.contains'),
+            keyForList: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+            text: translate('search.filters.merchant.contains'),
+            isSelected: merchantOperator === CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
         },
     ];
 
@@ -55,15 +58,15 @@ function TextInputFilterContent({filterKey, value: initialValue, autoFocus, larg
                     onChange={(v) => setValue(typeof v === 'string' ? v : undefined)}
                 />
                 {shouldShowMerchantMatchType && (
-                    <View style={[styles.mt4, styles.ph5]}>
-                        <Text style={[styles.textLabelSupporting, styles.mb2]}>{translate('search.filters.merchant.matchType')}</Text>
+                    <View style={styles.mt4}>
+                        <Text style={[styles.textLabelSupporting, styles.mb2, styles.ph5]}>{translate('search.filters.merchant.matchType')}</Text>
                         {merchantMatchTypeItems.map((item) => (
-                            <RadioButtonWithLabel
-                                key={item.value}
-                                isChecked={item.value === merchantOperator}
-                                style={styles.optionRowCompact}
-                                onPress={() => setMerchantOperator(item.value)}
-                                label={item.label}
+                            <SingleSelectListItem
+                                key={item.keyForList}
+                                item={item}
+                                showTooltip={false}
+                                keyForList={item.keyForList}
+                                onSelectRow={() => setMerchantOperator(item.keyForList)}
                             />
                         ))}
                     </View>

From 3e69172372ee5961133af01c46c29efc131c63ba Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Tue, 30 Jun 2026 18:25:40 +0700
Subject: [PATCH 08/38] fix: inline merchant filter input under match type
 option

Follow the Amount filter pattern: render Equal to / Contains as
SingleSelectListItem rows with the merchant text input shown inline
under the selected option, and drop the standalone "Match type" label.
Remove the now-unused merchant.matchType translation key.

Addresses review feedback on PR #83733.
---
 .../TextInputFilterContent.tsx                | 49 ++++++++++---------
 src/languages/de.ts                           |  2 +-
 src/languages/en.ts                           |  1 -
 src/languages/es.ts                           |  2 +-
 src/languages/fr.ts                           |  2 +-
 src/languages/it.ts                           |  2 +-
 src/languages/ja.ts                           |  2 +-
 src/languages/nl.ts                           |  2 +-
 src/languages/pl.ts                           |  2 +-
 src/languages/pt-BR.ts                        |  2 +-
 src/languages/zh-hans.ts                      |  2 +-
 11 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
index 0f1bb2b14a5e..e177df0e5f63 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
@@ -1,10 +1,9 @@
-import React, {useState} from 'react';
+import React, {Fragment, useState} from 'react';
 import {View} from 'react-native';
 import type {StyleProp, ViewStyle} from 'react-native';
 import Button from '@components/Button';
 import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelectListItem';
 import type {ListItem} from '@components/SelectionList/types';
-import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import CONST from '@src/CONST';
@@ -46,31 +45,33 @@ function TextInputFilterContent({filterKey, value: initialValue, autoFocus, larg
         },
     ];
 
+    const filterInput = (
+        <FilterComponents
+            value={value}
+            policyIDs={undefined}
+            filterKey={filterKey}
+            policyIDQuery={undefined}
+            autoFocus={autoFocus}
+            onChange={(v) => setValue(typeof v === 'string' ? v : undefined)}
+        />
+    );
+
     return (
         <View style={[styles.flex1, styles.justifyContentBetween, style]}>
             <View>
-                <FilterComponents
-                    value={value}
-                    policyIDs={undefined}
-                    filterKey={filterKey}
-                    policyIDQuery={undefined}
-                    autoFocus={autoFocus}
-                    onChange={(v) => setValue(typeof v === 'string' ? v : undefined)}
-                />
-                {shouldShowMerchantMatchType && (
-                    <View style={styles.mt4}>
-                        <Text style={[styles.textLabelSupporting, styles.mb2, styles.ph5]}>{translate('search.filters.merchant.matchType')}</Text>
-                        {merchantMatchTypeItems.map((item) => (
-                            <SingleSelectListItem
-                                key={item.keyForList}
-                                item={item}
-                                showTooltip={false}
-                                keyForList={item.keyForList}
-                                onSelectRow={() => setMerchantOperator(item.keyForList)}
-                            />
-                        ))}
-                    </View>
-                )}
+                {shouldShowMerchantMatchType
+                    ? merchantMatchTypeItems.map((item) => (
+                          <Fragment key={item.keyForList}>
+                              <SingleSelectListItem
+                                  item={item}
+                                  showTooltip={false}
+                                  keyForList={item.keyForList}
+                                  onSelectRow={() => setMerchantOperator(item.keyForList)}
+                              />
+                              {item.isSelected && <View style={styles.mt2}>{filterInput}</View>}
+                          </Fragment>
+                      ))
+                    : filterInput}
             </View>
             <Button
                 style={[styles.ph5, styles.pb5]}
diff --git a/src/languages/de.ts b/src/languages/de.ts
index eb4ee80ff668..7f4ffd0a8279 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -8547,7 +8547,7 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Bezahlen',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Export',
             },
-            merchant: {matchType: 'Übereinstimmungstyp', equalTo: 'Gleich wie', contains: 'Enthält'},
+            merchant: {equalTo: 'Gleich wie', contains: 'Enthält'},
         },
         display: {
             label: 'Anzeige',
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 18ed7ca23e9c..f92487527f75 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -8586,7 +8586,6 @@ const translations = {
                 equalTo: (amount?: string) => `Equal to ${amount ?? ''}`,
             },
             merchant: {
-                matchType: 'Match type',
                 equalTo: 'Equal to',
                 contains: 'Contains',
             },
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 65186900943a..718b49d249fc 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -8363,7 +8363,7 @@ ${amount} para ${merchant} - ${date}`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exportar',
             },
             reportField: (name, value) => `${name} es ${value}`,
-            merchant: {matchType: 'Tipo de coincidencia', equalTo: 'Igual a', contains: 'Contiene'},
+            merchant: {equalTo: 'Igual a', contains: 'Contiene'},
         },
         chartTitles: {
             [CONST.SEARCH.GROUP_BY.FROM]: 'De',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 3dc46702a1d6..45e629296578 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -8581,7 +8581,7 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Payer',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exporter',
             },
-            merchant: {matchType: 'Type de correspondance', equalTo: 'Égal à', contains: 'Contient'},
+            merchant: {equalTo: 'Égal à', contains: 'Contient'},
         },
         display: {
             label: 'Affichage',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 4b5f658d614d..64e645496e68 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -8536,7 +8536,7 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Paga',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Esporta',
             },
-            merchant: {matchType: 'Tipo di corrispondenza', equalTo: 'Uguale a', contains: 'Contiene'},
+            merchant: {equalTo: 'Uguale a', contains: 'Contiene'},
         },
         display: {
             label: 'Visualizza',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 8fbc9703bfa2..d0bc697694db 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -8435,7 +8435,7 @@ ${reportName}`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: '支払う',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'エクスポート',
             },
-            merchant: {matchType: 'マッチタイプ', equalTo: '等しい', contains: '含む'},
+            merchant: {equalTo: '等しい', contains: '含む'},
         },
         display: {
             label: '表示',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 239a73f9fc7f..4170c0e00637 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -8507,7 +8507,7 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Betalen',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exporteren',
             },
-            merchant: {matchType: 'Overeenkomsttype', equalTo: 'Gelijk aan', contains: 'Bevat'},
+            merchant: {equalTo: 'Gelijk aan', contains: 'Bevat'},
         },
         display: {
             label: 'Weergave',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 3cd0f9c476f2..e82b65680c0e 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -8496,7 +8496,7 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Zapłać',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Eksportuj',
             },
-            merchant: {matchType: 'Typ dopasowania', equalTo: 'Równe', contains: 'Zawiera'},
+            merchant: {equalTo: 'Równe', contains: 'Zawiera'},
         },
         display: {
             label: 'Wyświetl',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 9963a60b8fd4..18453779e9ae 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -8494,7 +8494,7 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Pagar',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exportar',
             },
-            merchant: {matchType: 'Tipo de correspondência', equalTo: 'Igual a', contains: 'Contém'},
+            merchant: {equalTo: 'Igual a', contains: 'Contém'},
         },
         display: {
             label: 'Exibir',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index c965b1cd7a4d..28d92624b72f 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -8265,7 +8265,7 @@ ${reportName}`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: '支付',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: '导出',
             },
-            merchant: {matchType: '匹配类型', equalTo: '等于', contains: '包含'},
+            merchant: {equalTo: '等于', contains: '包含'},
         },
         display: {
             label: '显示',

From d7ae22f03ac2b5bdbb46fa8f93ace45802418a4b Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Tue, 30 Jun 2026 18:31:48 +0700
Subject: [PATCH 09/38] fix: match Amount filter spacing for merchant input
 (mv2)

---
 .../FilterComponents/AdvancedFilters/TextInputFilterContent.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
index e177df0e5f63..60659650c787 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
@@ -68,7 +68,7 @@ function TextInputFilterContent({filterKey, value: initialValue, autoFocus, larg
                                   keyForList={item.keyForList}
                                   onSelectRow={() => setMerchantOperator(item.keyForList)}
                               />
-                              {item.isSelected && <View style={styles.mt2}>{filterInput}</View>}
+                              {item.isSelected && <View style={styles.mv2}>{filterInput}</View>}
                           </Fragment>
                       ))
                     : filterInput}

From f4dca8ec1bd5af196768b6c41ec9bb7cd62dd6f2 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Tue, 30 Jun 2026 21:04:23 +0700
Subject: [PATCH 10/38] refactor: align merchant filter input with Amount via
 containerStyles

Thread an optional containerStyles prop through FilterComponents to the
shared text input instead of wrapping it in a margin View, so the
merchant input uses the exact same [ph4, mv2] container as the Amount
filter input.
---
 .../TextInputFilterContent.tsx                |  3 ++-
 .../Search/FilterComponents/index.tsx         | 23 ++++++++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
index 60659650c787..05a01e631d47 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
@@ -52,6 +52,7 @@ function TextInputFilterContent({filterKey, value: initialValue, autoFocus, larg
             filterKey={filterKey}
             policyIDQuery={undefined}
             autoFocus={autoFocus}
+            textInputContainerStyle={shouldShowMerchantMatchType ? [styles.ph4, styles.mv2] : undefined}
             onChange={(v) => setValue(typeof v === 'string' ? v : undefined)}
         />
     );
@@ -68,7 +69,7 @@ function TextInputFilterContent({filterKey, value: initialValue, autoFocus, larg
                                   keyForList={item.keyForList}
                                   onSelectRow={() => setMerchantOperator(item.keyForList)}
                               />
-                              {item.isSelected && <View style={styles.mv2}>{filterInput}</View>}
+                              {item.isSelected && filterInput}
                           </Fragment>
                       ))
                     : filterInput}
diff --git a/src/components/Search/FilterComponents/index.tsx b/src/components/Search/FilterComponents/index.tsx
index f3f54af44310..5db4a54c637a 100644
--- a/src/components/Search/FilterComponents/index.tsx
+++ b/src/components/Search/FilterComponents/index.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import type {StyleProp, ViewStyle} from 'react-native';
 import type {SearchAmountFilterKeys, SearchDateFilterKeys, SearchFilterCommonProps} from '@components/Search/types';
 import TextInput from '@components/TextInput';
 import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
@@ -31,6 +32,7 @@ type FilterComponentsProps = SearchFilterCommonProps<SearchAdvancedFiltersForm[F
     type?: SearchDataTypes;
     policyIDs: string[] | undefined;
     policyIDQuery: string[] | undefined;
+    textInputContainerStyle?: StyleProp<ViewStyle>;
 };
 
 type TextInputFilterComponentsProps = {
@@ -43,6 +45,7 @@ type TextInputFilterComponentsProps = {
         | typeof CONST.SEARCH.SYNTAX_FILTER_KEYS.WITHDRAWAL_ID;
     value: string | undefined;
     autoFocus?: boolean;
+    containerStyles?: StyleProp<ViewStyle>;
     onChange: (value: string) => void;
 };
 
@@ -63,7 +66,7 @@ type MultiSelectFilterComponentsProps = SearchFilterCommonProps<SearchAdvancedFi
     type: SearchDataTypes | undefined;
 };
 
-function TextInputFilterComponents({filterKey, value, autoFocus, onChange}: TextInputFilterComponentsProps) {
+function TextInputFilterComponents({filterKey, value, autoFocus, containerStyles, onChange}: TextInputFilterComponentsProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
 
@@ -78,7 +81,7 @@ function TextInputFilterComponents({filterKey, value, autoFocus, onChange}: Text
             onChangeText={onChange}
             accessibilityLabel={label}
             role={CONST.ROLE.PRESENTATION}
-            containerStyles={[styles.ph5]}
+            containerStyles={containerStyles ?? [styles.ph5]}
         />
     );
 }
@@ -123,7 +126,20 @@ function MultiSelectFilterComponents({filterKey, value = [], type = CONST.SEARCH
     );
 }
 
-function FilterComponents({filterKey, value, type, policyIDs, policyIDQuery, selectionListTextInputStyle, selectionListStyle, autoFocus, ready, footer, onChange}: FilterComponentsProps) {
+function FilterComponents({
+    filterKey,
+    value,
+    type,
+    policyIDs,
+    policyIDQuery,
+    selectionListTextInputStyle,
+    selectionListStyle,
+    textInputContainerStyle,
+    autoFocus,
+    ready,
+    footer,
+    onChange,
+}: FilterComponentsProps) {
     switch (filterKey) {
         case CONST.SEARCH.SYNTAX_FILTER_KEYS.FEED:
         case CONST.SEARCH.SYNTAX_FILTER_KEYS.CARD_ID:
@@ -178,6 +194,7 @@ function FilterComponents({filterKey, value, type, policyIDs, policyIDQuery, sel
                     filterKey={filterKey}
                     value={typeof value === 'string' ? value : undefined}
                     autoFocus={autoFocus}
+                    containerStyles={textInputContainerStyle}
                     onChange={onChange}
                 />
             );

From c8393b960e37039b761240194b943eb2900b2356 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Fri, 3 Jul 2026 15:42:23 +0700
Subject: [PATCH 11/38] style: apply oxfmt to merge-resolved search filter
 files

---
 .../AdvancedFilters/SearchAdvancedFiltersContent.tsx  |  2 ++
 .../AdvancedFilters/TextInputFilterContent.tsx        | 11 ++++++++---
 src/components/Search/FilterComponents/index.tsx      |  3 ++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
index 06738d67a96f..024954190788 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
@@ -4,7 +4,9 @@ import type {SearchFilter} from '@libs/SearchUIUtils';
 import CONST from '@src/CONST';
 import type {SearchAdvancedFiltersForm} from '@src/types/form';
 import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
+
 import React from 'react';
+
 import type {FilterComponentsProps} from '..';
 import type {AmountFilterContentProps} from './AmountFilterContent';
 import type {CommonFilterContentProps} from './CommonFilterContent';
diff --git a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
index 05a01e631d47..5b4cac8b4f9c 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
@@ -1,13 +1,18 @@
-import React, {Fragment, useState} from 'react';
-import {View} from 'react-native';
-import type {StyleProp, ViewStyle} from 'react-native';
 import Button from '@components/Button';
 import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelectListItem';
 import type {ListItem} from '@components/SelectionList/types';
+
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
+
 import CONST from '@src/CONST';
 import type {MerchantMatchType} from '@src/types/form/SearchAdvancedFiltersForm';
+
+import type {StyleProp, ViewStyle} from 'react-native';
+
+import React, {Fragment, useState} from 'react';
+import {View} from 'react-native';
+
 import FilterComponents from '..';
 
 type TextInputFilterContentProps = {
diff --git a/src/components/Search/FilterComponents/index.tsx b/src/components/Search/FilterComponents/index.tsx
index 92fd5c35e037..6e1bd8456aca 100644
--- a/src/components/Search/FilterComponents/index.tsx
+++ b/src/components/Search/FilterComponents/index.tsx
@@ -1,4 +1,3 @@
-import type {StyleProp, ViewStyle} from 'react-native';
 import type {SearchAmountFilterKeys, SearchDateFilterKeys, SearchFilterCommonProps} from '@components/Search/types';
 import TextInput from '@components/TextInput';
 import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
@@ -14,6 +13,8 @@ import CONST from '@src/CONST';
 import type {SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
 import type {SearchDataTypes} from '@src/types/onyx/SearchResults';
 
+import type {StyleProp, ViewStyle} from 'react-native';
+
 import React from 'react';
 
 import BankAccountSelector from './BankAccountSelector';

From 30b6796b7f02422341f9b231ce920d86a88d5880 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Tue, 14 Jul 2026 12:27:01 +0700
Subject: [PATCH 12/38] fix(search): escape contains operator in keyword
 queries

---
 src/libs/SearchQueryUtils.ts              | 2 +-
 tests/unit/Search/SearchQueryUtilsTest.ts | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index 699e556e8760..8765101b3d55 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -176,7 +176,7 @@ function sanitizeSearchValue(str: string) {
     return str;
 }
 
-const syntaxRegex = new RegExp(`^-?(${Object.values(CONST.SEARCH.SEARCH_USER_FRIENDLY_KEYS).join('|')}|report-?field(-.+)+)[:><=].+$`);
+const syntaxRegex = new RegExp(`^-?(${Object.values(CONST.SEARCH.SEARCH_USER_FRIENDLY_KEYS).join('|')}|report-?field(-.+)+)(?:\\*:|[:><=]).+$`);
 /**
  * Escapes each keyword that would otherwise be re-interpreted as query syntax by wrapping it in quotes.
  * A keyword that looks like a filter (e.g. `type:expense`) becomes `"type:expense"` so it is matched as a
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index 1b6ad1542920..917e86bc8b11 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -3564,6 +3564,14 @@ describe('SearchQueryUtils', () => {
             expect(result).toContain('type:trip');
         });
 
+        it('should escape input that uses the contains operator so it is treated as a keyword', () => {
+            const currentQueryJSON = buildSearchQueryJSON('type:trip status:all');
+
+            const result = currentQueryJSON ? getKeywordQueryWithCurrentSearchContext('merchant*:Uber', currentQueryJSON) : '';
+            expect(result).toContain('"merchant*:Uber"');
+            expect(result).toContain('type:trip');
+        });
+
         it('should escape input that uses a comparison operator with a filter key', () => {
             const currentQueryJSON = buildSearchQueryJSON('type:trip status:all');
 

From 95d9396721327850bdce2686e2fb38ed0ae42f65 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Fri, 17 Jul 2026 16:37:19 +0700
Subject: [PATCH 13/38] fix(search): reject negated contains filters

---
 src/libs/SearchParser/autocompleteParser.js    |  5 +++++
 src/libs/SearchParser/autocompleteParser.peggy |  5 +++++
 src/libs/SearchParser/searchParser.js          |  4 ++++
 src/libs/SearchParser/searchParser.peggy       |  4 ++++
 tests/unit/Search/SearchQueryUtilsTest.ts      | 10 ++++++++++
 tests/unit/SearchAutocompleteParserTest.ts     |  7 +++++++
 tests/unit/SearchParserTest.ts                 | 14 ++++++++++++++
 7 files changed, 49 insertions(+)

diff --git a/src/libs/SearchParser/autocompleteParser.js b/src/libs/SearchParser/autocompleteParser.js
index 68cbf57a776b..f48d6ac5fdf9 100644
--- a/src/libs/SearchParser/autocompleteParser.js
+++ b/src/libs/SearchParser/autocompleteParser.js
@@ -443,6 +443,11 @@ function peg$parse(input, options) {
 
       const isNegated = !!neg && !nonNegatableKeys.has(key);
 
+      if (neg && op === "contains") {
+        autocomplete = null;
+        return;
+      }
+
       if (!value) {
         autocomplete = {
           key,
diff --git a/src/libs/SearchParser/autocompleteParser.peggy b/src/libs/SearchParser/autocompleteParser.peggy
index 9efaadf55527..b9150c18e3cf 100644
--- a/src/libs/SearchParser/autocompleteParser.peggy
+++ b/src/libs/SearchParser/autocompleteParser.peggy
@@ -40,6 +40,11 @@ defaultFilter
 
       const isNegated = !!neg && !nonNegatableKeys.has(key);
 
+      if (neg && op === "contains") {
+        autocomplete = null;
+        return;
+      }
+
       if (!value) {
         autocomplete = {
           key,
diff --git a/src/libs/SearchParser/searchParser.js b/src/libs/SearchParser/searchParser.js
index 5df4f76dc8e3..6fbc2ec6f300 100644
--- a/src/libs/SearchParser/searchParser.js
+++ b/src/libs/SearchParser/searchParser.js
@@ -496,6 +496,10 @@ function peg$parse(input, options) {
       const key = field;
       let operator = op;
 
+      if (neg && operator === "contains") {
+        return buildFilter("eq", "keyword", text().trim());
+      }
+
       // Apply negation only when "-" is present and the key can be negated
       if (neg && !nonNegatableKeys.has(key)) {
         if (operator === "eq") {
diff --git a/src/libs/SearchParser/searchParser.peggy b/src/libs/SearchParser/searchParser.peggy
index 57389645633f..bfd87038eab8 100644
--- a/src/libs/SearchParser/searchParser.peggy
+++ b/src/libs/SearchParser/searchParser.peggy
@@ -237,6 +237,10 @@ standardFilter
       const key = field;
       let operator = op;
 
+      if (neg && operator === "contains") {
+        return buildFilter("eq", "keyword", text().trim());
+      }
+
       // Apply negation only when "-" is present and the key can be negated
       if (neg && !nonNegatableKeys.has(key)) {
         if (operator === "eq") {
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index c7ff7e08b476..cfe80c7fc4ca 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -2133,6 +2133,16 @@ describe('SearchQueryUtils', () => {
         });
     });
 
+    describe('contains filter parsing', () => {
+        it('treats negated contains as a keyword', () => {
+            const queryJSON = buildSearchQueryJSON('type:expense -merchant*:Uber');
+            const keywordFilter = queryJSON?.flatFilters.find((filter) => filter.key === CONST.SEARCH.SYNTAX_FILTER_KEYS.KEYWORD);
+
+            expect(keywordFilter?.filters.some((filter) => filter.value === '-merchant*:Uber')).toBe(true);
+            expect(queryJSON?.flatFilters.some((filter) => filter.key === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT)).toBe(false);
+        });
+    });
+
     describe('getFilterDisplayValue', () => {
         const mockCardList = {};
         const mockCardFeeds = {};
diff --git a/tests/unit/SearchAutocompleteParserTest.ts b/tests/unit/SearchAutocompleteParserTest.ts
index 4e7184965662..22b8aaabf1a9 100644
--- a/tests/unit/SearchAutocompleteParserTest.ts
+++ b/tests/unit/SearchAutocompleteParserTest.ts
@@ -335,6 +335,13 @@ const tests = [
             ],
         },
     },
+    {
+        query: 'type:expense -merchant*:Uber',
+        expected: {
+            autocomplete: null,
+            ranges: [{key: 'type', value: 'expense', negated: false, start: 5, length: 7}],
+        },
+    },
 ];
 
 const limitAutocompleteTests = [
diff --git a/tests/unit/SearchParserTest.ts b/tests/unit/SearchParserTest.ts
index f53542dc1f91..f9fa5ee09cf8 100644
--- a/tests/unit/SearchParserTest.ts
+++ b/tests/unit/SearchParserTest.ts
@@ -999,6 +999,20 @@ const tests = [
  */
 
 const keywordTests = [
+    {
+        query: '-merchant*:Uber',
+        expected: {
+            type: 'expense',
+            sortBy: 'date',
+            sortOrder: 'desc',
+            view: 'table',
+            filters: {
+                operator: 'eq',
+                left: 'keyword',
+                right: ['-merchant*:Uber'],
+            },
+        },
+    },
     {
         query: '" " "  "', // Multiple whitespaces wrapped in quotes
         expected: {

From e1d2f61be67ba15ead56b15741289012c67d5ad2 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Tue, 4 Aug 2026 04:49:46 +0700
Subject: [PATCH 14/38] Fix merchant operator rows overlapping the value input
 on native

SingleSelectListItem's BaseListItem stack miscalculates row height when
rendered outside a SelectionList on native (Fabric), collapsing the row
so the merchant value input overlapped the Equal to/Contains labels.
Replace the two operator rows with a plain PressableWithFeedback +
ListRadioButton row, which lays out correctly on all platforms. Web
rendering is unchanged.
---
 .../TextInputFilterContent.tsx                | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
index 525cd9b8943e..7b45ffce1dd9 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
@@ -1,9 +1,11 @@
 import Button from '@components/Button';
+import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import NegatableFilter from '@components/Search/FilterComponents/NegatableFilter';
 import useTextFilterValidation from '@components/Search/hooks/useTextFilterValidation';
 import type {ReportFieldTextKey, SearchTextFilterKeys} from '@components/Search/types';
-import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelectListItem';
+import ListRadioButton from '@components/SelectionList/components/ListRadioButton';
 import type {ListItem} from '@components/SelectionList/types';
+import Text from '@components/Text';
 import TextInput from '@components/TextInput';
 import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
 
@@ -99,12 +101,19 @@ function TextInputFilterContent({
                     {shouldShowMerchantMatchType
                         ? merchantMatchTypeItems.map((item) => (
                               <Fragment key={item.keyForList}>
-                                  <SingleSelectListItem
-                                      item={item}
-                                      showTooltip={false}
-                                      keyForList={item.keyForList}
-                                      onSelectRow={() => setMerchantOperator(item.keyForList)}
-                                  />
+                                  <PressableWithFeedback
+                                      sentryLabel="TextInputFilterContent-MerchantMatchType"
+                                      accessibilityLabel={item.text ?? ''}
+                                      role={CONST.ROLE.BUTTON}
+                                      onPress={() => setMerchantOperator(item.keyForList)}
+                                      style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, styles.ph5, styles.optionRow]}
+                                  >
+                                      <Text style={[styles.optionDisplayName, styles.sidebarLinkTextBold]}>{item.text}</Text>
+                                      <ListRadioButton
+                                          item={item}
+                                          onSelectRow={() => setMerchantOperator(item.keyForList)}
+                                      />
+                                  </PressableWithFeedback>
                                   {item.isSelected && filterInput}
                               </Fragment>
                           ))

From d1fa1cd1f39859c31f4080ed35bcf891142d6f4e Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Thu, 6 Aug 2026 10:11:28 +0700
Subject: [PATCH 15/38] Add missing merchant filter translation to Greek (el)

---
 src/languages/el.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/languages/el.ts b/src/languages/el.ts
index 156176de9848..9c8c327dd00a 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -9230,6 +9230,10 @@ ${reportName}`,
                 },
                 equalTo: (amount?: string) => `Ίσο με ${amount ?? ''}`,
             },
+            merchant: {
+                equalTo: 'Ίσο με',
+                contains: 'Περιέχει',
+            },
             card: {
                 expensify: 'Expensify',
                 travelInvoicing: 'Ενοποιημένη τιμολόγηση ταξιδιών',

From 2a353ed1b2f5b14535119cffa3be92c9509ad7f4 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Fri, 7 Aug 2026 17:13:09 +0700
Subject: [PATCH 16/38] fix(search): hide merchant match types when negated

---
 .../TextInputFilterContent.tsx                |  2 +-
 tests/ui/TextInputFilterContentTest.tsx       | 51 +++++++++++++++++++
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 tests/ui/TextInputFilterContentTest.tsx

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
index 7b45ffce1dd9..bc9ceef0d43c 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
@@ -52,7 +52,7 @@ function TextInputFilterContent({
     const styles = useThemeStyles();
     const [value, setValue] = useState(initialValue);
     const [isNegated, setIsNegated] = useState(initialIsNegated);
-    const shouldShowMerchantMatchType = baseFilterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT;
+    const shouldShowMerchantMatchType = baseFilterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT && !isNegated;
     const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(initialMerchantOperator ?? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
     const merchantMatchTypeItems: Array<ListItem<MerchantMatchType>> = [
         {
diff --git a/tests/ui/TextInputFilterContentTest.tsx b/tests/ui/TextInputFilterContentTest.tsx
new file mode 100644
index 000000000000..0cb5ff065c25
--- /dev/null
+++ b/tests/ui/TextInputFilterContentTest.tsx
@@ -0,0 +1,51 @@
+import {fireEvent, render, screen} from '@testing-library/react-native';
+
+import TextInputFilterContent from '@components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent';
+
+import CONST from '@src/CONST';
+
+jest.mock('@hooks/useAutoFocusInput', () => () => ({inputCallbackRef: jest.fn()}));
+jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
+
+function renderMerchantFilter(onChange = jest.fn()) {
+    return {
+        onChange,
+        ...render(
+            <TextInputFilterContent
+                baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}
+                value="I"
+                isNegated={false}
+                merchantOperator={CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS}
+                onChange={onChange}
+            />,
+        ),
+    };
+}
+
+describe('TextInputFilterContent', () => {
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('hides the merchant match type and omits the operator when the filter is negated', () => {
+        // Given a positive Merchant Contains filter where both match options must be available.
+        const {onChange} = renderMerchantFilter();
+
+        expect(screen.getByRole('button', {name: 'search.filters.merchant.equalTo'})).toBeOnTheScreen();
+        expect(screen.getByRole('button', {name: 'search.filters.merchant.contains'})).toBeOnTheScreen();
+
+        // When the user negates the filter because negated Merchant searches only support exact matching.
+        fireEvent.press(screen.getByText('search.filters.filterType.is.negative'));
+
+        // Then match options disappear so the UI matches the submitted query.
+        expect(screen.queryByRole('button', {name: 'search.filters.merchant.equalTo'})).not.toBeOnTheScreen();
+        expect(screen.queryByRole('button', {name: 'search.filters.merchant.contains'})).not.toBeOnTheScreen();
+        expect(screen.getByLabelText('common.merchant')).toBeOnTheScreen();
+
+        // When the user confirms the negated filter after match options disappear.
+        fireEvent.press(screen.getByText('common.confirm'));
+
+        // Then no Merchant operator is submitted because negated searches only support exact matching.
+        expect(onChange).toHaveBeenCalledWith('I', true, undefined);
+    });
+});

From 81247ea28cbc402ecee73e2fdae24ca18ae443dc Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Sat, 15 Aug 2026 05:14:42 +0700
Subject: [PATCH 17/38] fix(search): align merchant filter with rules layout

---
 .../TextInputFilterContent.tsx                | 59 ++++++++----------
 tests/ui/TextInputFilterContentTest.tsx       | 61 +++++++++++++++----
 2 files changed, 76 insertions(+), 44 deletions(-)

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
index bc9ceef0d43c..0bdae06c1a14 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
@@ -1,10 +1,10 @@
 import Button from '@components/Button';
-import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import NegatableFilter from '@components/Search/FilterComponents/NegatableFilter';
 import useTextFilterValidation from '@components/Search/hooks/useTextFilterValidation';
 import type {ReportFieldTextKey, SearchTextFilterKeys} from '@components/Search/types';
-import ListRadioButton from '@components/SelectionList/components/ListRadioButton';
-import type {ListItem} from '@components/SelectionList/types';
+import SelectionList from '@components/SelectionList';
+import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelectListItem';
+import type {ListItem} from '@components/SelectionList/ListItem/types';
 import Text from '@components/Text';
 import TextInput from '@components/TextInput';
 import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
@@ -20,7 +20,7 @@ import type {MerchantMatchType} from '@src/types/form/SearchAdvancedFiltersForm'
 
 import type {TextInput as RNTextInput, StyleProp, ViewStyle} from 'react-native';
 
-import React, {Fragment, useState} from 'react';
+import React, {useState} from 'react';
 import {View} from 'react-native';
 
 type TextInputFilterContentProps = {
@@ -55,16 +55,16 @@ function TextInputFilterContent({
     const shouldShowMerchantMatchType = baseFilterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT && !isNegated;
     const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(initialMerchantOperator ?? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
     const merchantMatchTypeItems: Array<ListItem<MerchantMatchType>> = [
-        {
-            keyForList: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
-            text: translate('search.filters.merchant.equalTo'),
-            isSelected: merchantOperator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
-        },
         {
             keyForList: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
-            text: translate('search.filters.merchant.contains'),
+            text: translate('workspace.rules.merchantRules.matchTypeContains'),
             isSelected: merchantOperator === CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
         },
+        {
+            keyForList: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+            text: translate('workspace.rules.merchantRules.matchTypeExact'),
+            isSelected: merchantOperator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+        },
     ];
 
     const label = translate(FILTER_VIEW_MAP[baseFilterKey].labelKey);
@@ -86,7 +86,7 @@ function TextInputFilterContent({
             onChangeText={setValue}
             accessibilityLabel={label}
             role={CONST.ROLE.PRESENTATION}
-            containerStyles={shouldShowMerchantMatchType ? [styles.ph4, styles.mv2] : [styles.ph5]}
+            containerStyles={shouldShowMerchantMatchType ? [styles.ph5, styles.mb5] : [styles.ph5]}
         />
     );
 
@@ -96,28 +96,23 @@ function TextInputFilterContent({
                 baseFilterKey={baseFilterKey}
                 isNegated={isNegated}
                 onNegationChange={setIsNegated}
+                style={shouldShowMerchantMatchType ? styles.flex1 : undefined}
             >
-                <View>
-                    {shouldShowMerchantMatchType
-                        ? merchantMatchTypeItems.map((item) => (
-                              <Fragment key={item.keyForList}>
-                                  <PressableWithFeedback
-                                      sentryLabel="TextInputFilterContent-MerchantMatchType"
-                                      accessibilityLabel={item.text ?? ''}
-                                      role={CONST.ROLE.BUTTON}
-                                      onPress={() => setMerchantOperator(item.keyForList)}
-                                      style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, styles.ph5, styles.optionRow]}
-                                  >
-                                      <Text style={[styles.optionDisplayName, styles.sidebarLinkTextBold]}>{item.text}</Text>
-                                      <ListRadioButton
-                                          item={item}
-                                          onSelectRow={() => setMerchantOperator(item.keyForList)}
-                                      />
-                                  </PressableWithFeedback>
-                                  {item.isSelected && filterInput}
-                              </Fragment>
-                          ))
-                        : filterInput}
+                <View style={shouldShowMerchantMatchType ? styles.flex1 : undefined}>
+                    {filterInput}
+                    {shouldShowMerchantMatchType && (
+                        <>
+                            <View style={[styles.pb2, styles.ph5]}>
+                                <Text style={[styles.textLabelSupporting]}>{translate('workspace.rules.merchantRules.matchType')}</Text>
+                            </View>
+                            <SelectionList
+                                data={merchantMatchTypeItems}
+                                ListItem={SingleSelectListItem}
+                                onSelectRow={(item) => setMerchantOperator(item.keyForList)}
+                                shouldSingleExecuteRowSelect
+                            />
+                        </>
+                    )}
                 </View>
             </NegatableFilter>
             <Button
diff --git a/tests/ui/TextInputFilterContentTest.tsx b/tests/ui/TextInputFilterContentTest.tsx
index 0cb5ff065c25..86c0c4b18582 100644
--- a/tests/ui/TextInputFilterContentTest.tsx
+++ b/tests/ui/TextInputFilterContentTest.tsx
@@ -4,6 +4,8 @@ import TextInputFilterContent from '@components/Search/FilterComponents/Advanced
 
 import CONST from '@src/CONST';
 
+import {NavigationContainer} from '@react-navigation/native';
+
 jest.mock('@hooks/useAutoFocusInput', () => () => ({inputCallbackRef: jest.fn()}));
 jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
 
@@ -11,13 +13,15 @@ function renderMerchantFilter(onChange = jest.fn()) {
     return {
         onChange,
         ...render(
-            <TextInputFilterContent
-                baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}
-                value="I"
-                isNegated={false}
-                merchantOperator={CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS}
-                onChange={onChange}
-            />,
+            <NavigationContainer>
+                <TextInputFilterContent
+                    baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}
+                    value="I"
+                    isNegated={false}
+                    merchantOperator={CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS}
+                    onChange={onChange}
+                />
+            </NavigationContainer>,
         ),
     };
 }
@@ -27,20 +31,53 @@ describe('TextInputFilterContent', () => {
         jest.clearAllMocks();
     });
 
+    it('keeps the merchant input fixed above the Rules match type options', () => {
+        // Given a positive Merchant Contains filter using the Rules layout.
+        const {onChange} = renderMerchantFilter();
+        const merchantInput = screen.getByLabelText('common.merchant');
+
+        expect(screen.getByText('workspace.rules.merchantRules.matchType')).toBeOnTheScreen();
+        expect(screen.getByText('workspace.rules.merchantRules.matchTypeContains')).toBeOnTheScreen();
+        expect(screen.getByText('workspace.rules.merchantRules.matchTypeExact')).toBeOnTheScreen();
+
+        // When the user edits the input and changes the match type.
+        fireEvent.changeText(merchantInput, 'Ibis');
+        fireEvent.press(screen.getByText('workspace.rules.merchantRules.matchTypeExact'));
+
+        // Then the input stays mounted with its current value.
+        expect(screen.getByLabelText('common.merchant')).toBe(merchantInput);
+        expect(screen.getByDisplayValue('Ibis')).toBeOnTheScreen();
+
+        fireEvent.press(screen.getByText('common.confirm'));
+
+        expect(onChange).toHaveBeenCalledWith('Ibis', false, CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
+    });
+
+    it('submits the selected Contains operator from the Rules layout', () => {
+        const {onChange} = renderMerchantFilter();
+
+        fireEvent.press(screen.getByText('common.confirm'));
+
+        expect(onChange).toHaveBeenCalledWith('I', false, CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
+    });
+
     it('hides the merchant match type and omits the operator when the filter is negated', () => {
         // Given a positive Merchant Contains filter where both match options must be available.
         const {onChange} = renderMerchantFilter();
+        const merchantInput = screen.getByLabelText('common.merchant');
 
-        expect(screen.getByRole('button', {name: 'search.filters.merchant.equalTo'})).toBeOnTheScreen();
-        expect(screen.getByRole('button', {name: 'search.filters.merchant.contains'})).toBeOnTheScreen();
+        expect(screen.getByText('workspace.rules.merchantRules.matchType')).toBeOnTheScreen();
+        expect(screen.getByText('workspace.rules.merchantRules.matchTypeContains')).toBeOnTheScreen();
+        expect(screen.getByText('workspace.rules.merchantRules.matchTypeExact')).toBeOnTheScreen();
 
         // When the user negates the filter because negated Merchant searches only support exact matching.
         fireEvent.press(screen.getByText('search.filters.filterType.is.negative'));
 
         // Then match options disappear so the UI matches the submitted query.
-        expect(screen.queryByRole('button', {name: 'search.filters.merchant.equalTo'})).not.toBeOnTheScreen();
-        expect(screen.queryByRole('button', {name: 'search.filters.merchant.contains'})).not.toBeOnTheScreen();
-        expect(screen.getByLabelText('common.merchant')).toBeOnTheScreen();
+        expect(screen.queryByText('workspace.rules.merchantRules.matchType')).not.toBeOnTheScreen();
+        expect(screen.queryByText('workspace.rules.merchantRules.matchTypeContains')).not.toBeOnTheScreen();
+        expect(screen.queryByText('workspace.rules.merchantRules.matchTypeExact')).not.toBeOnTheScreen();
+        expect(screen.getByLabelText('common.merchant')).toBe(merchantInput);
 
         // When the user confirms the negated filter after match options disappear.
         fireEvent.press(screen.getByText('common.confirm'));

From d664814d929d6116b6cbb241ff9a317c9ae45624 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Tue, 18 Aug 2026 11:26:00 +0700
Subject: [PATCH 18/38] fix(search): address review feedback on merchant
 contains operator

- Remove unused merchant equalTo/contains translation keys from all locales
- Simplify getMerchantOperator with nullish coalescing
- Restrict the contains operator (*:) to the merchant field; non-merchant
  input falls back to keyword and autocomplete rejects it
---
 src/languages/de.ts                           |  1 -
 src/languages/el.ts                           |  4 ---
 src/languages/en.ts                           |  4 ---
 src/languages/es.ts                           |  1 -
 src/languages/fr.ts                           |  1 -
 src/languages/it.ts                           |  1 -
 src/languages/ja.ts                           |  1 -
 src/languages/nl.ts                           |  1 -
 src/languages/pl.ts                           |  1 -
 src/languages/pt-BR.ts                        |  1 -
 src/languages/zh-hans.ts                      |  1 -
 src/libs/SearchParser/autocompleteParser.js   |  3 +-
 .../SearchParser/autocompleteParser.peggy     |  3 +-
 src/libs/SearchParser/searchParser.js         |  7 ++++-
 src/libs/SearchParser/searchParser.peggy      |  7 ++++-
 src/libs/SearchQueryUtils.ts                  |  2 +-
 tests/unit/SearchAutocompleteParserTest.ts    |  8 +++++
 tests/unit/SearchParserTest.ts                | 30 +++++++++++++++++++
 18 files changed, 55 insertions(+), 22 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index cba5c7ee8dd5..635638daa3ab 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -9103,7 +9103,6 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Bezahlen',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Export',
             },
-            merchant: {equalTo: 'Gleich wie', contains: 'Enthält'},
             filterType: {label: 'Filtertyp', has: {positive: 'hat', negative: 'hat nicht'}, is: {positive: 'ist', negative: 'ist nicht'}},
         },
         display: {
diff --git a/src/languages/el.ts b/src/languages/el.ts
index f5cbf42e725a..d90403cca7b6 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -9270,10 +9270,6 @@ ${reportName}`,
                 },
                 equalTo: (amount?: string) => `Ίσο με ${amount ?? ''}`,
             },
-            merchant: {
-                equalTo: 'Ίσο με',
-                contains: 'Περιέχει',
-            },
             card: {
                 expensify: 'Expensify',
                 travelInvoicing: 'Ενοποιημένη τιμολόγηση ταξιδιών',
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 5cc8dce4ca6d..4634fd9386ed 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -9182,10 +9182,6 @@ const translations = {
                 },
                 equalTo: (amount?: string) => `Equal to ${amount ?? ''}`,
             },
-            merchant: {
-                equalTo: 'Equal to',
-                contains: 'Contains',
-            },
             card: {
                 expensify: 'Expensify',
                 travelInvoicing: 'Consolidated Travel Billing',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 23f554668215..154b29106a74 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -8964,7 +8964,6 @@ El plan Controlar empieza en 9 $ por miembro activo al mes.`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exportar',
             },
             reportField: (name, value) => `${name} es ${value}`,
-            merchant: {equalTo: 'Igual a', contains: 'Contiene'},
             filterType: {label: 'Tipo de filtro', has: {positive: 'tiene', negative: 'no tiene'}, is: {positive: 'es', negative: 'no es'}},
         },
         chartTitles: {
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index cab2f30f26bb..d5fb36e85b25 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -9138,7 +9138,6 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Payer',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exporter',
             },
-            merchant: {equalTo: 'Égal à', contains: 'Contient'},
             filterType: {label: 'Type de filtre', has: {positive: 'a', negative: 'n’a pas'}, is: {positive: 'est', negative: 'n’est pas'}},
         },
         display: {
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 57f47a918a41..8e1b563d788f 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -9075,7 +9075,6 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Paga',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Esporta',
             },
-            merchant: {equalTo: 'Uguale a', contains: 'Contiene'},
             filterType: {label: 'Tipo di filtro', has: {positive: 'ha', negative: 'non ha'}, is: {positive: 'è', negative: 'non è'}},
         },
         display: {
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 5c777b078812..283c302e0312 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -8962,7 +8962,6 @@ ${reportName}`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: '支払う',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'エクスポート',
             },
-            merchant: {equalTo: '等しい', contains: '含む'},
             filterType: {label: 'フィルタータイプ', has: {positive: '持っています', negative: '持っていません'}, is: {positive: 'は', negative: 'ではありません'}},
         },
         display: {
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index f6ebb5a1bbbc..c313ee7d3e65 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -9046,7 +9046,6 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Betalen',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exporteren',
             },
-            merchant: {equalTo: 'Gelijk aan', contains: 'Bevat'},
             filterType: {label: 'Filtertype', has: {positive: 'heeft', negative: 'heeft niet'}, is: {positive: 'is', negative: 'is niet'}},
         },
         display: {
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 47833b5ab793..ad7bfa61e49f 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -9023,7 +9023,6 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Zapłać',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Eksportuj',
             },
-            merchant: {equalTo: 'Równe', contains: 'Zawiera'},
             filterType: {label: 'Typ filtra', has: {positive: 'ma', negative: 'nie ma'}, is: {positive: 'jest', negative: 'nie jest'}},
         },
         display: {
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 7fe933524286..ebb2357903b4 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -9041,7 +9041,6 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: 'Pagar',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exportar',
             },
-            merchant: {equalTo: 'Igual a', contains: 'Contém'},
             filterType: {label: 'Tipo de filtro', has: {positive: 'tem', negative: 'não tem'}, is: {positive: 'é', negative: 'não é'}},
         },
         display: {
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index b6a0936ea03e..cbe4a0c5063b 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -8726,7 +8726,6 @@ ${reportName}`,
                 [CONST.SEARCH.ACTION_FILTERS.PAY]: '支付',
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: '导出',
             },
-            merchant: {equalTo: '等于', contains: '包含'},
             filterType: {label: '筛选类型', has: {positive: '有', negative: '没有'}, is: {positive: '是', negative: '不是'}},
         },
         display: {
diff --git a/src/libs/SearchParser/autocompleteParser.js b/src/libs/SearchParser/autocompleteParser.js
index 69c41e6a1f26..0765f531f4ea 100644
--- a/src/libs/SearchParser/autocompleteParser.js
+++ b/src/libs/SearchParser/autocompleteParser.js
@@ -467,7 +467,8 @@ function peg$parse(input, options) {
 
       const isNegated = !!neg && !nonNegatableKeys.has(key);
 
-      if (neg && op === "contains") {
+      // The "contains" operator is only supported for the merchant field
+      if (op === "contains" && (neg || key !== "merchant")) {
         autocomplete = null;
         return;
       }
diff --git a/src/libs/SearchParser/autocompleteParser.peggy b/src/libs/SearchParser/autocompleteParser.peggy
index a27936722760..9bf08c42f092 100644
--- a/src/libs/SearchParser/autocompleteParser.peggy
+++ b/src/libs/SearchParser/autocompleteParser.peggy
@@ -40,7 +40,8 @@ defaultFilter
 
       const isNegated = !!neg && !nonNegatableKeys.has(key);
 
-      if (neg && op === "contains") {
+      // The "contains" operator is only supported for the merchant field
+      if (op === "contains" && (neg || key !== "merchant")) {
         autocomplete = null;
         return;
       }
diff --git a/src/libs/SearchParser/searchParser.js b/src/libs/SearchParser/searchParser.js
index a0f36d952b84..c29dc191c56e 100644
--- a/src/libs/SearchParser/searchParser.js
+++ b/src/libs/SearchParser/searchParser.js
@@ -501,6 +501,10 @@ function peg$parse(input, options) {
       );
     };
   var peg$f2 = function(key, op, value) {
+      // The "contains" operator is only supported for the merchant field
+      if (op === "contains") {
+        return buildFilter("eq", "keyword", text().trim());
+      }
       updateDefaultValues(key, value);
       return {...buildFilter(op, key, value), isDefault: true};
     };
@@ -520,7 +524,8 @@ function peg$parse(input, options) {
       const key = field;
       let operator = op;
 
-      if (neg && operator === "contains") {
+      // The "contains" operator is only supported for the merchant field
+      if (operator === "contains" && (neg || key !== "merchant")) {
         return buildFilter("eq", "keyword", text().trim());
       }
 
diff --git a/src/libs/SearchParser/searchParser.peggy b/src/libs/SearchParser/searchParser.peggy
index 7199419f1b28..9d2153efc066 100644
--- a/src/libs/SearchParser/searchParser.peggy
+++ b/src/libs/SearchParser/searchParser.peggy
@@ -214,6 +214,10 @@ filter = @(standardFilter / defaultFilter / freeTextFilter)
 
 defaultFilter
   = _ key:defaultKey _ op:operator _ value:identifier {
+      // The "contains" operator is only supported for the merchant field
+      if (op === "contains") {
+        return buildFilter("eq", "keyword", text().trim());
+      }
       updateDefaultValues(key, value);
       return {...buildFilter(op, key, value), isDefault: true};
     }
@@ -237,7 +241,8 @@ standardFilter
       const key = field;
       let operator = op;
 
-      if (neg && operator === "contains") {
+      // The "contains" operator is only supported for the merchant field
+      if (operator === "contains" && (neg || key !== "merchant")) {
         return buildFilter("eq", "keyword", text().trim());
       }
 
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index b190d0180421..7635e71d8b4a 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -104,7 +104,7 @@ const operatorToCharMap = {
 const DEFAULT_MERCHANT_OPERATOR = CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO;
 
 function getMerchantOperator(operator: MerchantMatchType | undefined): MerchantMatchType {
-    return operator === CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS ? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS : DEFAULT_MERCHANT_OPERATOR;
+    return operator ?? DEFAULT_MERCHANT_OPERATOR;
 }
 
 // Pre-computed validation Sets for buildFilterFormValuesFromQuery (avoids recreating per filter iteration)
diff --git a/tests/unit/SearchAutocompleteParserTest.ts b/tests/unit/SearchAutocompleteParserTest.ts
index 43d80a96088b..70dfc78bb415 100644
--- a/tests/unit/SearchAutocompleteParserTest.ts
+++ b/tests/unit/SearchAutocompleteParserTest.ts
@@ -348,6 +348,14 @@ const tests: Array<{query: string; expected: ExpectedAutocompleteParserResult}>
             ranges: [{key: 'type', value: 'expense', negated: false, start: 5, length: 7}],
         },
     },
+    {
+        // The "contains" operator is only supported for the merchant field
+        query: 'type:expense category*:travel',
+        expected: {
+            autocomplete: null,
+            ranges: [{key: 'type', value: 'expense', negated: false, start: 5, length: 7}],
+        },
+    },
 ];
 
 const limitAutocompleteTests: Array<{query: string; expected: ExpectedAutocompleteParserResult; description: string}> = [
diff --git a/tests/unit/SearchParserTest.ts b/tests/unit/SearchParserTest.ts
index ace3f4fee2a7..8688d7d80a5e 100644
--- a/tests/unit/SearchParserTest.ts
+++ b/tests/unit/SearchParserTest.ts
@@ -1012,6 +1012,36 @@ const keywordTests = [
             },
         },
     },
+    {
+        // The "contains" operator is only supported for the merchant field
+        query: 'category*:travel',
+        expected: {
+            type: 'expense',
+            sortBy: 'date',
+            sortOrder: 'desc',
+            view: 'table',
+            filters: {
+                operator: 'eq',
+                left: 'keyword',
+                right: ['category*:travel'],
+            },
+        },
+    },
+    {
+        // The "contains" operator is not supported for default keys
+        query: 'type*:expense',
+        expected: {
+            type: 'expense',
+            sortBy: 'date',
+            sortOrder: 'desc',
+            view: 'table',
+            filters: {
+                operator: 'eq',
+                left: 'keyword',
+                right: ['type*:expense'],
+            },
+        },
+    },
     {
         query: '" " "  "', // Multiple whitespaces wrapped in quotes
         expected: {

From dd4a4fcaedbe25564aaa6ef5663aa0703d2d0d39 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Thu, 20 Aug 2026 16:20:18 +0700
Subject: [PATCH 19/38] fix(search): show merchant match type on filter chip
 and chip popup

- Add a Merchant branch to getDisplayValue so the chip label reads
  Exactly matches "I" / Contains "I" instead of the raw value
- Extract MerchantMatchTypeSelector and reuse it in the chip popup
  (TextFilterPopup) and the advanced filters RHP
- Chip popup now writes merchantOperator on Apply; negated merchant
  keeps exact matching
- Add TextFilterPopup UI tests and getDisplayValue merchant unit tests
---
 .../TextInputFilterContent.tsx                | 33 ++------
 .../MerchantMatchTypeSelector.tsx             | 57 ++++++++++++++
 .../FilterDropdowns/TextFilterPopup.tsx       | 47 +++++++++---
 src/libs/SearchUIUtils.ts                     | 13 ++++
 tests/ui/TextFilterPopupTest.tsx              | 75 +++++++++++++++++++
 tests/unit/Search/SearchUIUtilsTest.ts        | 30 ++++++++
 6 files changed, 216 insertions(+), 39 deletions(-)
 create mode 100644 src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx
 create mode 100644 tests/ui/TextFilterPopupTest.tsx

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
index 1367fb499180..02965a5ae9c5 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
@@ -1,11 +1,8 @@
 import Button from '@components/ButtonComposed';
+import MerchantMatchTypeSelector from '@components/Search/FilterComponents/MerchantMatchTypeSelector';
 import NegatableFilter from '@components/Search/FilterComponents/NegatableFilter';
 import useTextFilterValidation from '@components/Search/hooks/useTextFilterValidation';
 import type {ReportFieldTextKey, SearchTextFilterKeys} from '@components/Search/types';
-import SelectionList from '@components/SelectionList';
-import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelectListItem';
-import type {ListItem} from '@components/SelectionList/ListItem/types';
-import Text from '@components/Text';
 import TextInput from '@components/TextInput';
 import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
 
@@ -55,19 +52,6 @@ function TextInputFilterContent({
     const [isNegated, setIsNegated] = useState(initialIsNegated);
     const shouldShowMerchantMatchType = baseFilterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT && !isNegated;
     const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(initialMerchantOperator ?? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
-    const merchantMatchTypeItems: Array<ListItem<MerchantMatchType>> = [
-        {
-            keyForList: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
-            text: translate('workspace.rules.merchantRules.matchTypeContains'),
-            isSelected: merchantOperator === CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
-        },
-        {
-            keyForList: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
-            text: translate('workspace.rules.merchantRules.matchTypeExact'),
-            isSelected: merchantOperator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
-        },
-    ];
-
     const label = translate(FILTER_VIEW_MAP[baseFilterKey].labelKey);
     const {inputCallbackRef} = useAutoFocusInput();
     const error = useTextFilterValidation(baseFilterKey, value);
@@ -102,17 +86,10 @@ function TextInputFilterContent({
                 <View style={shouldShowMerchantMatchType ? styles.flex1 : undefined}>
                     {filterInput}
                     {shouldShowMerchantMatchType && (
-                        <>
-                            <View style={[styles.pb2, styles.ph5]}>
-                                <Text style={[styles.textLabelSupporting]}>{translate('workspace.rules.merchantRules.matchType')}</Text>
-                            </View>
-                            <SelectionList
-                                data={merchantMatchTypeItems}
-                                ListItem={SingleSelectListItem}
-                                onSelectRow={(item) => setMerchantOperator(item.keyForList)}
-                                shouldSingleExecuteRowSelect
-                            />
-                        </>
+                        <MerchantMatchTypeSelector
+                            value={merchantOperator}
+                            onChange={setMerchantOperator}
+                        />
                     )}
                 </View>
             </NegatableFilter>
diff --git a/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx b/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx
new file mode 100644
index 000000000000..9d74fbc288d9
--- /dev/null
+++ b/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx
@@ -0,0 +1,57 @@
+/**
+ * Shared Merchant match type selector for search filter surfaces.
+ */
+import SelectionList from '@components/SelectionList';
+import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelectListItem';
+import type {ListItem} from '@components/SelectionList/ListItem/types';
+import Text from '@components/Text';
+
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import CONST from '@src/CONST';
+import type {MerchantMatchType} from '@src/types/form/SearchAdvancedFiltersForm';
+
+import React from 'react';
+import {View} from 'react-native';
+
+type MerchantMatchTypeSelectorProps = {
+    /** Currently selected Merchant match type. */
+    value: MerchantMatchType;
+
+    /** Updates the selected Merchant match type. */
+    onChange: (value: MerchantMatchType) => void;
+};
+
+function MerchantMatchTypeSelector({value, onChange}: MerchantMatchTypeSelectorProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const items: Array<ListItem<MerchantMatchType>> = [
+        {
+            keyForList: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+            text: translate('workspace.rules.merchantRules.matchTypeContains'),
+            isSelected: value === CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+        },
+        {
+            keyForList: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+            text: translate('workspace.rules.merchantRules.matchTypeExact'),
+            isSelected: value === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+        },
+    ];
+
+    return (
+        <>
+            <View style={[styles.pb2, styles.ph5]}>
+                <Text style={[styles.textLabelSupporting]}>{translate('workspace.rules.merchantRules.matchType')}</Text>
+            </View>
+            <SelectionList
+                data={items}
+                ListItem={SingleSelectListItem}
+                onSelectRow={(item) => onChange(item.keyForList)}
+                shouldSingleExecuteRowSelect
+            />
+        </>
+    );
+}
+
+export default MerchantMatchTypeSelector;
diff --git a/src/components/Search/FilterDropdowns/TextFilterPopup.tsx b/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
index 92c5d679c3f3..d224b884ca5c 100644
--- a/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
+++ b/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
@@ -1,3 +1,4 @@
+import MerchantMatchTypeSelector from '@components/Search/FilterComponents/MerchantMatchTypeSelector';
 import NegatableFilter from '@components/Search/FilterComponents/NegatableFilter';
 import useTextFilterValidation from '@components/Search/hooks/useTextFilterValidation';
 import type {ReportFieldTextKey, SearchTextFilterKeys} from '@components/Search/types';
@@ -9,9 +10,12 @@ import {getFilterFormValues} from '@libs/SearchQueryUtils';
 import {getFilterNegatableValue} from '@libs/SearchUIUtils';
 
 import CONST from '@src/CONST';
+import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
 import type {SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
+import type {MerchantMatchType} from '@src/types/form/SearchAdvancedFiltersForm';
 
 import React, {useState} from 'react';
+import {View} from 'react-native';
 
 import type {PopoverComponentProps} from './FilterPopupButton';
 
@@ -31,14 +35,34 @@ function TextFilterPopup({baseFilterKey, values, label, updateFilterForm, closeO
     const {isNegated: initialIsNegated, value: initialValue} = getFilterNegatableValue(baseFilterKey, values);
     const [isNegated, setIsNegated] = useState(initialIsNegated);
     const [value, setValue] = useState(initialValue);
+    const isMerchantFilter = baseFilterKey === FILTER_KEYS.MERCHANT;
+    const shouldShowMerchantMatchType = isMerchantFilter && !isNegated;
+    const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(values?.[FILTER_KEYS.MERCHANT_OPERATOR] ?? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
 
     const error = useTextFilterValidation(baseFilterKey, value);
+    const filterInput = (
+        <TextInput
+            placeholder={label}
+            value={value}
+            errorText={error}
+            hasError={!!error}
+            onChangeText={setValue}
+            accessibilityLabel={label}
+            role={CONST.ROLE.PRESENTATION}
+            containerStyles={shouldShowMerchantMatchType ? [styles.ph5, styles.mb5] : [styles.ph5]}
+        />
+    );
 
     const applyChanges = () => {
         if (error) {
             return;
         }
-        updateFilterForm(getFilterFormValues(baseFilterKey, value, isNegated));
+        updateFilterForm({
+            ...getFilterFormValues(baseFilterKey, value, isNegated),
+            ...(isMerchantFilter && {
+                [FILTER_KEYS.MERCHANT_OPERATOR]: shouldShowMerchantMatchType ? merchantOperator : CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+            }),
+        });
         closeOverlay();
     };
 
@@ -53,16 +77,17 @@ function TextFilterPopup({baseFilterKey, values, label, updateFilterForm, closeO
                 isNegated={isNegated}
                 onNegationChange={setIsNegated}
             >
-                <TextInput
-                    placeholder={label}
-                    value={value}
-                    errorText={error}
-                    hasError={!!error}
-                    onChangeText={setValue}
-                    accessibilityLabel={label}
-                    role={CONST.ROLE.PRESENTATION}
-                    containerStyles={[styles.ph5]}
-                />
+                {shouldShowMerchantMatchType ? (
+                    <View>
+                        {filterInput}
+                        <MerchantMatchTypeSelector
+                            value={merchantOperator}
+                            onChange={setMerchantOperator}
+                        />
+                    </View>
+                ) : (
+                    filterInput
+                )}
             </NegatableFilter>
         </BasePopup>
     );
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index fb57d415d458..b6ca64516be6 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -5714,6 +5714,19 @@ function getDisplayValue(
         return form[key]?.map((receiptType) => translate(getReceiptTypeTranslationKey(receiptType))).join(', ');
     }
 
+    if (key === FILTER_KEYS.MERCHANT) {
+        const merchant = form[key];
+        if (!merchant) {
+            return;
+        }
+
+        const matchTypeKey =
+            form[FILTER_KEYS.MERCHANT_OPERATOR] === CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS
+                ? 'workspace.rules.merchantRules.matchTypeContains'
+                : 'workspace.rules.merchantRules.matchTypeExact';
+        return `${translate(matchTypeKey)} "${merchant}"`;
+    }
+
     const formValue = form[key];
     return Array.isArray(formValue) ? formValue.join(', ') : formValue;
 }
diff --git a/tests/ui/TextFilterPopupTest.tsx b/tests/ui/TextFilterPopupTest.tsx
new file mode 100644
index 000000000000..30d3bf9b7828
--- /dev/null
+++ b/tests/ui/TextFilterPopupTest.tsx
@@ -0,0 +1,75 @@
+import {fireEvent, render, screen} from '@testing-library/react-native';
+
+import TextFilterPopup from '@components/Search/FilterDropdowns/TextFilterPopup';
+
+import CONST from '@src/CONST';
+import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
+
+import {NavigationContainer} from '@react-navigation/native';
+
+jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
+jest.mock('@hooks/useResponsiveLayout', () => () => ({isSmallScreenWidth: false}));
+
+function renderMerchantPopup() {
+    const closeOverlay = jest.fn();
+    const updateFilterForm = jest.fn();
+
+    render(
+        <NavigationContainer>
+            <TextFilterPopup
+                baseFilterKey={FILTER_KEYS.MERCHANT}
+                values={{
+                    [FILTER_KEYS.MERCHANT]: 'I',
+                    [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+                }}
+                label="common.merchant"
+                closeOverlay={closeOverlay}
+                updateFilterForm={updateFilterForm}
+            />
+        </NavigationContainer>,
+    );
+
+    return {closeOverlay, updateFilterForm};
+}
+
+describe('TextFilterPopup', () => {
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('shows and submits the Merchant match type', () => {
+        const {closeOverlay, updateFilterForm} = renderMerchantPopup();
+
+        expect(screen.getByText('workspace.rules.merchantRules.matchType')).toBeOnTheScreen();
+        expect(screen.getByText('workspace.rules.merchantRules.matchTypeContains')).toBeOnTheScreen();
+        expect(screen.getByText('workspace.rules.merchantRules.matchTypeExact')).toBeOnTheScreen();
+
+        fireEvent.press(screen.getByText('workspace.rules.merchantRules.matchTypeExact'));
+        fireEvent.press(screen.getByText('common.apply'));
+
+        expect(updateFilterForm).toHaveBeenCalledWith({
+            [FILTER_KEYS.MERCHANT]: 'I',
+            [FILTER_KEYS.MERCHANT_NOT]: undefined,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+        });
+        expect(closeOverlay).toHaveBeenCalledTimes(1);
+    });
+
+    it('hides the match type and submits exact matching for a negated Merchant', () => {
+        const {updateFilterForm} = renderMerchantPopup();
+
+        fireEvent.press(screen.getByText('search.filters.filterType.is.negative'));
+
+        expect(screen.queryByText('workspace.rules.merchantRules.matchType')).not.toBeOnTheScreen();
+        expect(screen.queryByText('workspace.rules.merchantRules.matchTypeContains')).not.toBeOnTheScreen();
+        expect(screen.queryByText('workspace.rules.merchantRules.matchTypeExact')).not.toBeOnTheScreen();
+
+        fireEvent.press(screen.getByText('common.apply'));
+
+        expect(updateFilterForm).toHaveBeenCalledWith({
+            [FILTER_KEYS.MERCHANT]: undefined,
+            [FILTER_KEYS.MERCHANT_NOT]: 'I',
+            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+        });
+    });
+});
diff --git a/tests/unit/Search/SearchUIUtilsTest.ts b/tests/unit/Search/SearchUIUtilsTest.ts
index e6ec008cdb34..ffd34e590070 100644
--- a/tests/unit/Search/SearchUIUtilsTest.ts
+++ b/tests/unit/Search/SearchUIUtilsTest.ts
@@ -11788,6 +11788,36 @@ describe('SearchUIUtils', () => {
 
             expect(result).toBe(translateLocal('common.read'));
         });
+
+        test('includes the exact match type in a Merchant filter label', () => {
+            const result = SearchUIUtils.getDisplayValue(
+                FILTER_KEYS.MERCHANT,
+                {
+                    [FILTER_KEYS.MERCHANT]: 'I',
+                    [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+                },
+                CONST.SEARCH.DATA_TYPES.EXPENSE,
+                translateLocal,
+                localeCompare,
+            );
+
+            expect(result).toBe(`${translateLocal('workspace.rules.merchantRules.matchTypeExact')} "I"`);
+        });
+
+        test('includes the contains match type in a Merchant filter label', () => {
+            const result = SearchUIUtils.getDisplayValue(
+                FILTER_KEYS.MERCHANT,
+                {
+                    [FILTER_KEYS.MERCHANT]: 'I',
+                    [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+                },
+                CONST.SEARCH.DATA_TYPES.EXPENSE,
+                translateLocal,
+                localeCompare,
+            );
+
+            expect(result).toBe(`${translateLocal('workspace.rules.merchantRules.matchTypeContains')} "I"`);
+        });
     });
 
     describe('filterValidHasValues', () => {

From bfe61533a36aafb03fb999fdd90c9a110b852dac Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Wed, 26 Aug 2026 14:45:11 +0700
Subject: [PATCH 20/38] fix(search): consolidate merchant popup imports

---
 src/components/Search/FilterDropdowns/TextFilterPopup.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/Search/FilterDropdowns/TextFilterPopup.tsx b/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
index d224b884ca5c..7a952e054fff 100644
--- a/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
+++ b/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
@@ -11,8 +11,7 @@ import {getFilterNegatableValue} from '@libs/SearchUIUtils';
 
 import CONST from '@src/CONST';
 import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
-import type {SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
-import type {MerchantMatchType} from '@src/types/form/SearchAdvancedFiltersForm';
+import type {MerchantMatchType, SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
 
 import React, {useState} from 'react';
 import {View} from 'react-native';

From b214d46b31cae3d3bd7ac9402e75d8c203ab71d6 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Thu, 27 Aug 2026 11:45:25 +0700
Subject: [PATCH 21/38] refactor(search): use search-scoped merchant
 translations

---
 .../MerchantMatchTypeSelector.tsx             |  6 +++---
 src/languages/de.ts                           |  1 +
 src/languages/el.ts                           |  1 +
 src/languages/en.ts                           |  5 +++++
 src/languages/es.ts                           |  2 +-
 src/languages/fr.ts                           |  1 +
 src/languages/it.ts                           |  1 +
 src/languages/ja.ts                           |  1 +
 src/languages/nl.ts                           |  1 +
 src/languages/pl.ts                           |  1 +
 src/languages/pt-BR.ts                        |  1 +
 src/languages/zh-hans.ts                      |  1 +
 src/libs/SearchUIUtils.ts                     |  5 +----
 tests/ui/TextFilterPopupTest.tsx              | 14 ++++++-------
 tests/ui/TextInputFilterContentTest.tsx       | 20 +++++++++----------
 tests/unit/Search/SearchUIUtilsTest.ts        |  4 ++--
 16 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx b/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx
index 9d74fbc288d9..4275ac9a07ba 100644
--- a/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx
+++ b/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx
@@ -29,12 +29,12 @@ function MerchantMatchTypeSelector({value, onChange}: MerchantMatchTypeSelectorP
     const items: Array<ListItem<MerchantMatchType>> = [
         {
             keyForList: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
-            text: translate('workspace.rules.merchantRules.matchTypeContains'),
+            text: translate('search.filters.merchant.contains'),
             isSelected: value === CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
         },
         {
             keyForList: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
-            text: translate('workspace.rules.merchantRules.matchTypeExact'),
+            text: translate('search.filters.merchant.exactMatch'),
             isSelected: value === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
         },
     ];
@@ -42,7 +42,7 @@ function MerchantMatchTypeSelector({value, onChange}: MerchantMatchTypeSelectorP
     return (
         <>
             <View style={[styles.pb2, styles.ph5]}>
-                <Text style={[styles.textLabelSupporting]}>{translate('workspace.rules.merchantRules.matchType')}</Text>
+                <Text style={[styles.textLabelSupporting]}>{translate('search.filters.merchant.matchType')}</Text>
             </View>
             <SelectionList
                 data={items}
diff --git a/src/languages/de.ts b/src/languages/de.ts
index 099d90c61989..3e2286123297 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -9304,6 +9304,7 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Export',
             },
             filterType: {label: 'Filtertyp', has: {positive: 'hat', negative: 'hat nicht'}, is: {positive: 'ist', negative: 'ist nicht'}},
+            merchant: {matchType: 'Übereinstimmungstyp', contains: 'Enthält', exactMatch: 'Exakte Übereinstimmungen'},
         },
         display: {
             label: 'Anzeige',
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 07098ff81d2f..28abbadd7dda 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -9523,6 +9523,7 @@ ${reportName}`,
                 has: {positive: 'έχει', negative: 'δεν έχει'},
                 is: {positive: 'είναι', negative: 'δεν είναι'},
             },
+            merchant: {matchType: 'Τύπος αντιστοίχισης', contains: 'Περιέχει', exactMatch: 'Ακριβής αντιστοιχία'},
         },
         display: {
             label: 'Εμφάνιση',
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 6287e2d5a6ee..ed5776e999fe 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -9379,6 +9379,11 @@ const translations = {
                 },
                 equalTo: (amount?: string) => `Equal to ${amount ?? ''}`,
             },
+            merchant: {
+                matchType: 'Match type',
+                contains: 'Contains',
+                exactMatch: 'Exactly matches',
+            },
             card: {
                 expensify: 'Expensify',
                 travelInvoicing: 'Consolidated Travel Billing',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index fc6e7adee416..13d92767d9a1 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -9,7 +9,6 @@
  * - Improve the prompts in prompts/translation, or
  * - Improve context annotations in src/languages/en.ts
  */
-
 import CONST from '@src/CONST';
 import type {OriginalMessageReportPreview, OriginalMessageSettlementAccountLocked, PersonalRulesModifiedFields, PolicyRulesModifiedFields} from '@src/types/onyx/OriginalMessage';
 
@@ -9174,6 +9173,7 @@ ${reportName}`,
             },
             reportField: (name, value) => `${name} es ${value}`,
             filterType: {label: 'Tipo de filtro', has: {positive: 'tiene', negative: 'no tiene'}, is: {positive: 'es', negative: 'no es'}},
+            merchant: {matchType: 'Tipo de coincidencia', contains: 'Contiene', exactMatch: 'Coincide exactamente'},
         },
         chartTitles: {
             [CONST.SEARCH.GROUP_BY.FROM]: 'De',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index aa9c91c3e6f5..5d7fbdc84f2b 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -9336,6 +9336,7 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exporter',
             },
             filterType: {label: 'Type de filtre', has: {positive: 'a', negative: 'n’a pas'}, is: {positive: 'est', negative: 'n’est pas'}},
+            merchant: {matchType: 'Type de correspondance', contains: 'Contient', exactMatch: 'Correspond exactement'},
         },
         display: {
             label: 'Affichage',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 0bfd2a9d44a1..cc96f6923305 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -9273,6 +9273,7 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Esporta',
             },
             filterType: {label: 'Tipo di filtro', has: {positive: 'ha', negative: 'non ha'}, is: {positive: 'è', negative: 'non è'}},
+            merchant: {matchType: 'Tipo di corrispondenza', contains: 'Contiene', exactMatch: 'Corrisponde esattamente'},
         },
         display: {
             label: 'Visualizza',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index edeac1248c9c..44c6e93207da 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -9149,6 +9149,7 @@ ${reportName}`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'エクスポート',
             },
             filterType: {label: 'フィルタータイプ', has: {positive: '持っています', negative: '持っていません'}, is: {positive: 'は', negative: 'ではありません'}},
+            merchant: {matchType: 'マッチタイプ', contains: '含む', exactMatch: '完全一致'},
         },
         display: {
             label: '表示',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index a48f7965ec28..99511f3e42fd 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -9241,6 +9241,7 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exporteren',
             },
             filterType: {label: 'Filtertype', has: {positive: 'heeft', negative: 'heeft niet'}, is: {positive: 'is', negative: 'is niet'}},
+            merchant: {matchType: 'Overeenkomsttype', contains: 'Bevat', exactMatch: 'Komt exact overeen'},
         },
         display: {
             label: 'Weergave',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 5e319a5c9344..7f2c9486763a 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -9266,6 +9266,7 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Eksportuj',
             },
             filterType: {label: 'Typ filtra', has: {positive: 'ma', negative: 'nie ma'}, is: {positive: 'jest', negative: 'nie jest'}},
+            merchant: {matchType: 'Typ dopasowania', contains: 'Zawiera', exactMatch: 'Dokładne dopasowanie'},
         },
         display: {
             label: 'Wyświetl',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 9a7cf3345f1e..818214c1f6a3 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -9238,6 +9238,7 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exportar',
             },
             filterType: {label: 'Tipo de filtro', has: {positive: 'tem', negative: 'não tem'}, is: {positive: 'é', negative: 'não é'}},
+            merchant: {matchType: 'Tipo de correspondência', contains: 'Contém', exactMatch: 'Corresponde exatamente'},
         },
         display: {
             label: 'Exibir',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 3385283d873d..d94712613b47 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -8904,6 +8904,7 @@ ${reportName}`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: '导出',
             },
             filterType: {label: '筛选类型', has: {positive: '有', negative: '没有'}, is: {positive: '是', negative: '不是'}},
+            merchant: {matchType: '匹配类型', contains: '包含', exactMatch: '完全匹配'},
         },
         display: {
             label: '显示',
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index e46acb248433..e87dce74c779 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -5870,10 +5870,7 @@ function getDisplayValue(
             return;
         }
 
-        const matchTypeKey =
-            form[FILTER_KEYS.MERCHANT_OPERATOR] === CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS
-                ? 'workspace.rules.merchantRules.matchTypeContains'
-                : 'workspace.rules.merchantRules.matchTypeExact';
+        const matchTypeKey = form[FILTER_KEYS.MERCHANT_OPERATOR] === CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS ? 'search.filters.merchant.contains' : 'search.filters.merchant.exactMatch';
         return `${translate(matchTypeKey)} "${merchant}"`;
     }
 
diff --git a/tests/ui/TextFilterPopupTest.tsx b/tests/ui/TextFilterPopupTest.tsx
index 30d3bf9b7828..311bef11bcae 100644
--- a/tests/ui/TextFilterPopupTest.tsx
+++ b/tests/ui/TextFilterPopupTest.tsx
@@ -40,11 +40,11 @@ describe('TextFilterPopup', () => {
     it('shows and submits the Merchant match type', () => {
         const {closeOverlay, updateFilterForm} = renderMerchantPopup();
 
-        expect(screen.getByText('workspace.rules.merchantRules.matchType')).toBeOnTheScreen();
-        expect(screen.getByText('workspace.rules.merchantRules.matchTypeContains')).toBeOnTheScreen();
-        expect(screen.getByText('workspace.rules.merchantRules.matchTypeExact')).toBeOnTheScreen();
+        expect(screen.getByText('search.filters.merchant.matchType')).toBeOnTheScreen();
+        expect(screen.getByText('search.filters.merchant.contains')).toBeOnTheScreen();
+        expect(screen.getByText('search.filters.merchant.exactMatch')).toBeOnTheScreen();
 
-        fireEvent.press(screen.getByText('workspace.rules.merchantRules.matchTypeExact'));
+        fireEvent.press(screen.getByText('search.filters.merchant.exactMatch'));
         fireEvent.press(screen.getByText('common.apply'));
 
         expect(updateFilterForm).toHaveBeenCalledWith({
@@ -60,9 +60,9 @@ describe('TextFilterPopup', () => {
 
         fireEvent.press(screen.getByText('search.filters.filterType.is.negative'));
 
-        expect(screen.queryByText('workspace.rules.merchantRules.matchType')).not.toBeOnTheScreen();
-        expect(screen.queryByText('workspace.rules.merchantRules.matchTypeContains')).not.toBeOnTheScreen();
-        expect(screen.queryByText('workspace.rules.merchantRules.matchTypeExact')).not.toBeOnTheScreen();
+        expect(screen.queryByText('search.filters.merchant.matchType')).not.toBeOnTheScreen();
+        expect(screen.queryByText('search.filters.merchant.contains')).not.toBeOnTheScreen();
+        expect(screen.queryByText('search.filters.merchant.exactMatch')).not.toBeOnTheScreen();
 
         fireEvent.press(screen.getByText('common.apply'));
 
diff --git a/tests/ui/TextInputFilterContentTest.tsx b/tests/ui/TextInputFilterContentTest.tsx
index 86c0c4b18582..985f4de277ff 100644
--- a/tests/ui/TextInputFilterContentTest.tsx
+++ b/tests/ui/TextInputFilterContentTest.tsx
@@ -36,13 +36,13 @@ describe('TextInputFilterContent', () => {
         const {onChange} = renderMerchantFilter();
         const merchantInput = screen.getByLabelText('common.merchant');
 
-        expect(screen.getByText('workspace.rules.merchantRules.matchType')).toBeOnTheScreen();
-        expect(screen.getByText('workspace.rules.merchantRules.matchTypeContains')).toBeOnTheScreen();
-        expect(screen.getByText('workspace.rules.merchantRules.matchTypeExact')).toBeOnTheScreen();
+        expect(screen.getByText('search.filters.merchant.matchType')).toBeOnTheScreen();
+        expect(screen.getByText('search.filters.merchant.contains')).toBeOnTheScreen();
+        expect(screen.getByText('search.filters.merchant.exactMatch')).toBeOnTheScreen();
 
         // When the user edits the input and changes the match type.
         fireEvent.changeText(merchantInput, 'Ibis');
-        fireEvent.press(screen.getByText('workspace.rules.merchantRules.matchTypeExact'));
+        fireEvent.press(screen.getByText('search.filters.merchant.exactMatch'));
 
         // Then the input stays mounted with its current value.
         expect(screen.getByLabelText('common.merchant')).toBe(merchantInput);
@@ -66,17 +66,17 @@ describe('TextInputFilterContent', () => {
         const {onChange} = renderMerchantFilter();
         const merchantInput = screen.getByLabelText('common.merchant');
 
-        expect(screen.getByText('workspace.rules.merchantRules.matchType')).toBeOnTheScreen();
-        expect(screen.getByText('workspace.rules.merchantRules.matchTypeContains')).toBeOnTheScreen();
-        expect(screen.getByText('workspace.rules.merchantRules.matchTypeExact')).toBeOnTheScreen();
+        expect(screen.getByText('search.filters.merchant.matchType')).toBeOnTheScreen();
+        expect(screen.getByText('search.filters.merchant.contains')).toBeOnTheScreen();
+        expect(screen.getByText('search.filters.merchant.exactMatch')).toBeOnTheScreen();
 
         // When the user negates the filter because negated Merchant searches only support exact matching.
         fireEvent.press(screen.getByText('search.filters.filterType.is.negative'));
 
         // Then match options disappear so the UI matches the submitted query.
-        expect(screen.queryByText('workspace.rules.merchantRules.matchType')).not.toBeOnTheScreen();
-        expect(screen.queryByText('workspace.rules.merchantRules.matchTypeContains')).not.toBeOnTheScreen();
-        expect(screen.queryByText('workspace.rules.merchantRules.matchTypeExact')).not.toBeOnTheScreen();
+        expect(screen.queryByText('search.filters.merchant.matchType')).not.toBeOnTheScreen();
+        expect(screen.queryByText('search.filters.merchant.contains')).not.toBeOnTheScreen();
+        expect(screen.queryByText('search.filters.merchant.exactMatch')).not.toBeOnTheScreen();
         expect(screen.getByLabelText('common.merchant')).toBe(merchantInput);
 
         // When the user confirms the negated filter after match options disappear.
diff --git a/tests/unit/Search/SearchUIUtilsTest.ts b/tests/unit/Search/SearchUIUtilsTest.ts
index d9b512d91f9c..603bc08a0971 100644
--- a/tests/unit/Search/SearchUIUtilsTest.ts
+++ b/tests/unit/Search/SearchUIUtilsTest.ts
@@ -12414,7 +12414,7 @@ describe('SearchUIUtils', () => {
                 localeCompare,
             );
 
-            expect(result).toBe(`${translateLocal('workspace.rules.merchantRules.matchTypeExact')} "I"`);
+            expect(result).toBe(`${translateLocal('search.filters.merchant.exactMatch')} "I"`);
         });
 
         test('includes the contains match type in a Merchant filter label', () => {
@@ -12429,7 +12429,7 @@ describe('SearchUIUtils', () => {
                 localeCompare,
             );
 
-            expect(result).toBe(`${translateLocal('workspace.rules.merchantRules.matchTypeContains')} "I"`);
+            expect(result).toBe(`${translateLocal('search.filters.merchant.contains')} "I"`);
         });
     });
 

From f30c813dd5e9ca279d295d814667a6e295e73b0c Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Fri, 4 Sep 2026 14:59:20 +0700
Subject: [PATCH 22/38] fix(search): default merchant filters to contains

---
 .../SearchAdvancedFiltersContent.tsx             |  2 +-
 .../AdvancedFilters/TextInputFilterContent.tsx   |  2 +-
 .../Search/FilterDropdowns/TextFilterPopup.tsx   |  2 +-
 src/libs/SearchQueryUtils.ts                     |  6 +++---
 src/libs/SearchUIUtils.ts                        |  2 +-
 tests/ui/TextFilterPopupTest.tsx                 | 16 ++++++++++++++--
 tests/ui/TextInputFilterContentTest.tsx          | 12 ++++++++++--
 tests/unit/Search/SearchQueryUtilsTest.ts        | 15 +++++++++++++--
 tests/unit/Search/SearchUIUtilsTest.ts           |  6 ++++++
 9 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
index cb0ad059f928..fc62ace7f3de 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
@@ -98,7 +98,7 @@ function SearchAdvancedFiltersContent({baseFilterKey, values, ready, components,
         const {isNegated, value} = getFilterNegatableValue(baseFilterKey, values);
         const TextFilter = components.Text;
         const isMerchantFilter = baseFilterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT;
-        const merchantOperator = values?.[FILTER_KEYS.MERCHANT_OPERATOR] ?? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO;
+        const merchantOperator = values?.[FILTER_KEYS.MERCHANT_OPERATOR] ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS;
         return (
             <TextFilter
                 key={isMerchantFilter ? `${baseFilterKey}-${merchantOperator}` : baseFilterKey}
diff --git a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
index 02965a5ae9c5..40d2fc36922a 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
@@ -51,7 +51,7 @@ function TextInputFilterContent({
     const [value, setValue] = useState(initialValue);
     const [isNegated, setIsNegated] = useState(initialIsNegated);
     const shouldShowMerchantMatchType = baseFilterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT && !isNegated;
-    const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(initialMerchantOperator ?? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
+    const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(initialMerchantOperator ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
     const label = translate(FILTER_VIEW_MAP[baseFilterKey].labelKey);
     const {inputCallbackRef} = useAutoFocusInput();
     const error = useTextFilterValidation(baseFilterKey, value);
diff --git a/src/components/Search/FilterDropdowns/TextFilterPopup.tsx b/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
index 7a952e054fff..50be29f732eb 100644
--- a/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
+++ b/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
@@ -36,7 +36,7 @@ function TextFilterPopup({baseFilterKey, values, label, updateFilterForm, closeO
     const [value, setValue] = useState(initialValue);
     const isMerchantFilter = baseFilterKey === FILTER_KEYS.MERCHANT;
     const shouldShowMerchantMatchType = isMerchantFilter && !isNegated;
-    const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(values?.[FILTER_KEYS.MERCHANT_OPERATOR] ?? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
+    const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(values?.[FILTER_KEYS.MERCHANT_OPERATOR] ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
 
     const error = useTextFilterValidation(baseFilterKey, value);
     const filterInput = (
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index 1d26d85ccc58..08cf6ab900e5 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -102,7 +102,7 @@ const operatorToCharMap = {
 };
 const EXPLICIT_EQUAL_TO_OPERATOR = '=' as const;
 
-const DEFAULT_MERCHANT_OPERATOR = CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO;
+const DEFAULT_MERCHANT_OPERATOR = CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS;
 
 function getMerchantOperator(operator: MerchantMatchType | undefined): MerchantMatchType {
     return operator ?? DEFAULT_MERCHANT_OPERATOR;
@@ -1379,8 +1379,8 @@ function buildFilterFormValuesFromQuery(
         if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT || filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.DESCRIPTION || filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.TITLE) {
             filtersForm[addNegation(filterKey, isNegated)] = filterValues.join(',');
             if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT && !isNegated) {
-                filtersForm[FILTER_KEYS.MERCHANT_OPERATOR] = filterList.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS)
-                    ? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS
+                filtersForm[FILTER_KEYS.MERCHANT_OPERATOR] = filterList.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO)
+                    ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO
                     : DEFAULT_MERCHANT_OPERATOR;
             }
         }
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index e87dce74c779..1509ffdf3b1e 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -5870,7 +5870,7 @@ function getDisplayValue(
             return;
         }
 
-        const matchTypeKey = form[FILTER_KEYS.MERCHANT_OPERATOR] === CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS ? 'search.filters.merchant.contains' : 'search.filters.merchant.exactMatch';
+        const matchTypeKey = form[FILTER_KEYS.MERCHANT_OPERATOR] === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO ? 'search.filters.merchant.exactMatch' : 'search.filters.merchant.contains';
         return `${translate(matchTypeKey)} "${merchant}"`;
     }
 
diff --git a/tests/ui/TextFilterPopupTest.tsx b/tests/ui/TextFilterPopupTest.tsx
index 311bef11bcae..9da812158edc 100644
--- a/tests/ui/TextFilterPopupTest.tsx
+++ b/tests/ui/TextFilterPopupTest.tsx
@@ -10,7 +10,7 @@ import {NavigationContainer} from '@react-navigation/native';
 jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
 jest.mock('@hooks/useResponsiveLayout', () => () => ({isSmallScreenWidth: false}));
 
-function renderMerchantPopup() {
+function renderMerchantPopup(hasStoredMerchantOperator = true) {
     const closeOverlay = jest.fn();
     const updateFilterForm = jest.fn();
 
@@ -20,7 +20,7 @@ function renderMerchantPopup() {
                 baseFilterKey={FILTER_KEYS.MERCHANT}
                 values={{
                     [FILTER_KEYS.MERCHANT]: 'I',
-                    [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+                    ...(hasStoredMerchantOperator ? {[FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS} : {}),
                 }}
                 label="common.merchant"
                 closeOverlay={closeOverlay}
@@ -55,6 +55,18 @@ describe('TextFilterPopup', () => {
         expect(closeOverlay).toHaveBeenCalledTimes(1);
     });
 
+    it('defaults to Contains when no Merchant operator is stored', () => {
+        const {updateFilterForm} = renderMerchantPopup(false);
+
+        fireEvent.press(screen.getByText('common.apply'));
+
+        expect(updateFilterForm).toHaveBeenCalledWith({
+            [FILTER_KEYS.MERCHANT]: 'I',
+            [FILTER_KEYS.MERCHANT_NOT]: undefined,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+        });
+    });
+
     it('hides the match type and submits exact matching for a negated Merchant', () => {
         const {updateFilterForm} = renderMerchantPopup();
 
diff --git a/tests/ui/TextInputFilterContentTest.tsx b/tests/ui/TextInputFilterContentTest.tsx
index 985f4de277ff..6e7fce3da3e0 100644
--- a/tests/ui/TextInputFilterContentTest.tsx
+++ b/tests/ui/TextInputFilterContentTest.tsx
@@ -9,7 +9,7 @@ import {NavigationContainer} from '@react-navigation/native';
 jest.mock('@hooks/useAutoFocusInput', () => () => ({inputCallbackRef: jest.fn()}));
 jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
 
-function renderMerchantFilter(onChange = jest.fn()) {
+function renderMerchantFilter(onChange = jest.fn(), hasStoredMerchantOperator = true) {
     return {
         onChange,
         ...render(
@@ -18,7 +18,7 @@ function renderMerchantFilter(onChange = jest.fn()) {
                     baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}
                     value="I"
                     isNegated={false}
-                    merchantOperator={CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS}
+                    merchantOperator={hasStoredMerchantOperator ? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS : undefined}
                     onChange={onChange}
                 />
             </NavigationContainer>,
@@ -61,6 +61,14 @@ describe('TextInputFilterContent', () => {
         expect(onChange).toHaveBeenCalledWith('I', false, CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
     });
 
+    it('defaults to Contains when no Merchant operator is stored', () => {
+        const {onChange} = renderMerchantFilter(jest.fn(), false);
+
+        fireEvent.press(screen.getByText('common.confirm'));
+
+        expect(onChange).toHaveBeenCalledWith('I', false, CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
+    });
+
     it('hides the merchant match type and omits the operator when the filter is negated', () => {
         // Given a positive Merchant Contains filter where both match options must be available.
         const {onChange} = renderMerchantFilter();
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index 2fc3348dbf51..d5771f5301d8 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -455,7 +455,18 @@ describe('SearchQueryUtils', () => {
 
             const result = buildQueryStringFromFilterFormValues(filterValues);
 
-            expect(result).toEqual('type:expense policyID:67890 merchant=Amazon description:Electronics laptop category:electronics,gadgets');
+            expect(result).toEqual('type:expense policyID:67890 merchant*:Amazon description:Electronics laptop category:electronics,gadgets');
+        });
+
+        test('defaults a merchant filter without an operator to contains', () => {
+            const filterValues: Partial<SearchAdvancedFiltersForm> = {
+                type: 'expense',
+                merchant: 'Amazon',
+            };
+
+            const result = buildQueryStringFromFilterFormValues(filterValues);
+
+            expect(result).toEqual('type:expense merchant*:Amazon');
         });
 
         test('builds contains merchant query when merchant operator is contains', () => {
@@ -781,7 +792,7 @@ describe('SearchQueryUtils', () => {
 
                 const result = buildQueryStringFromFilterFormValues(filterValues, {sortBy: 'amount', sortOrder: 'asc'});
 
-                expect(result).toEqual('sortBy:amount sortOrder:asc type:expense merchant=Amazon limit:25');
+                expect(result).toEqual('sortBy:amount sortOrder:asc type:expense merchant*:Amazon limit:25');
             });
 
             test('omits limit when not provided', () => {
diff --git a/tests/unit/Search/SearchUIUtilsTest.ts b/tests/unit/Search/SearchUIUtilsTest.ts
index 603bc08a0971..f534351073e8 100644
--- a/tests/unit/Search/SearchUIUtilsTest.ts
+++ b/tests/unit/Search/SearchUIUtilsTest.ts
@@ -12431,6 +12431,12 @@ describe('SearchUIUtils', () => {
 
             expect(result).toBe(`${translateLocal('search.filters.merchant.contains')} "I"`);
         });
+
+        test('defaults a Merchant filter label without an operator to contains', () => {
+            const result = SearchUIUtils.getDisplayValue(FILTER_KEYS.MERCHANT, {[FILTER_KEYS.MERCHANT]: 'I'}, CONST.SEARCH.DATA_TYPES.EXPENSE, translateLocal, localeCompare);
+
+            expect(result).toBe(`${translateLocal('search.filters.merchant.contains')} "I"`);
+        });
     });
 
     describe('filterValidHasValues', () => {

From 83bd6150efef29246e6912cc09db45ee4f7e8fbc Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Mon, 7 Sep 2026 16:44:49 +0700
Subject: [PATCH 23/38] fix(search): preserve merchant lists and isolate filter
 UI

---
 .../AdvancedFilters/MerchantFilterContent.tsx | 140 ++++++++++++++++++
 .../SearchAdvancedFiltersContent.tsx          |  43 ++++--
 .../TextInputFilterContent.tsx                |  33 +----
 .../MerchantFilterContentPopupWrapper.tsx     |  23 +++
 .../TextInputFilterContentPopupWrapper.tsx    |   3 +-
 .../SearchAdvancedFiltersPopup/index.tsx      |   2 +
 src/libs/SearchQueryUtils.ts                  |   5 +-
 .../MerchantFilterContentPageWrapper.tsx      |  22 +++
 .../SearchAdvancedFiltersContentBase.tsx      |   2 +
 .../TextInputFilterContentPageWrapper.tsx     |   3 +-
 tests/ui/MerchantFilterContentTest.tsx        | 111 ++++++++++++++
 tests/ui/TextInputFilterContentTest.tsx       |  66 +--------
 tests/unit/Search/SearchQueryUtilsTest.ts     |  85 +++++++++++
 13 files changed, 433 insertions(+), 105 deletions(-)
 create mode 100644 src/components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent.tsx
 create mode 100644 src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/MerchantFilterContentPopupWrapper.tsx
 create mode 100644 src/pages/Search/SearchAdvancedFiltersContentPage/MerchantFilterContentPageWrapper.tsx
 create mode 100644 tests/ui/MerchantFilterContentTest.tsx

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent.tsx
new file mode 100644
index 000000000000..632f9f791e9c
--- /dev/null
+++ b/src/components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent.tsx
@@ -0,0 +1,140 @@
+/**
+ * Renders the advanced Merchant filter input, match type, and negation controls.
+ */
+import Button from '@components/ButtonComposed';
+import MerchantMatchTypeSelector from '@components/Search/FilterComponents/MerchantMatchTypeSelector';
+import NegatableFilter from '@components/Search/FilterComponents/NegatableFilter';
+import useTextFilterValidation from '@components/Search/hooks/useTextFilterValidation';
+import TextInput from '@components/TextInput';
+import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
+
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {FILTER_VIEW_MAP} from '@libs/SearchUIUtils';
+
+import CONST from '@src/CONST';
+import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
+import type {MerchantMatchType, SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
+
+import type {TextInput as RNTextInput, StyleProp, ViewStyle} from 'react-native';
+import type {ValueOf} from 'type-fest';
+
+import React, {useState} from 'react';
+import {View} from 'react-native';
+
+type MerchantFilterContentProps = {
+    /** The Merchant filter key. */
+    baseFilterKey: typeof CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT;
+
+    /** The current Merchant value. */
+    value: string | undefined;
+
+    /** Whether the filter currently uses the negated value. */
+    isNegated: boolean;
+
+    /** The current Merchant match type. */
+    merchantOperator?: MerchantMatchType;
+
+    /** The button size used for confirmation. */
+    buttonSize?: Exclude<ValueOf<typeof CONST.BUTTON_SIZE>, typeof CONST.BUTTON_SIZE.SMALL>;
+
+    /** Whether the input should receive focus automatically. */
+    autoFocus?: boolean;
+
+    /** Additional styles for the filter content. */
+    style?: StyleProp<ViewStyle>;
+
+    /** Called with the updated Merchant filter form values. */
+    onChange: (values: Partial<SearchAdvancedFiltersForm>) => void;
+};
+
+function isTextInput(element: BaseTextInputRef | RNTextInput | null): element is RNTextInput {
+    return !!element && 'isFocused' in element;
+}
+
+function MerchantFilterContent({
+    baseFilterKey,
+    value: initialValue,
+    isNegated: initialIsNegated,
+    merchantOperator: initialMerchantOperator,
+    buttonSize,
+    autoFocus,
+    style,
+    onChange,
+}: MerchantFilterContentProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const [value, setValue] = useState(initialValue);
+    const [isNegated, setIsNegated] = useState(initialIsNegated);
+    const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(initialMerchantOperator ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
+    const shouldShowMerchantMatchType = !isNegated;
+    const label = translate(FILTER_VIEW_MAP[baseFilterKey].labelKey);
+    const {inputCallbackRef} = useAutoFocusInput();
+    const error = useTextFilterValidation(baseFilterKey, value);
+
+    const filterInput = (
+        <TextInput
+            ref={(ref) => {
+                if (!autoFocus || !isTextInput(ref)) {
+                    return;
+                }
+                inputCallbackRef(ref);
+            }}
+            placeholder={label}
+            value={value}
+            errorText={error}
+            hasError={!!error}
+            onChangeText={setValue}
+            accessibilityLabel={label}
+            role={CONST.ROLE.PRESENTATION}
+            containerStyles={shouldShowMerchantMatchType ? [styles.ph5, styles.mb5] : [styles.ph5]}
+        />
+    );
+
+    const updateMerchantFilter = () => {
+        if (error) {
+            return;
+        }
+
+        onChange({
+            [FILTER_KEYS.MERCHANT]: isNegated ? undefined : value,
+            [FILTER_KEYS.MERCHANT_NOT]: isNegated ? value : undefined,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: isNegated ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO : merchantOperator,
+        });
+    };
+
+    return (
+        <View style={[styles.flex1, styles.justifyContentBetween, style]}>
+            <NegatableFilter
+                baseFilterKey={baseFilterKey}
+                isNegated={isNegated}
+                onNegationChange={setIsNegated}
+                style={shouldShowMerchantMatchType ? styles.flex1 : undefined}
+            >
+                <View style={shouldShowMerchantMatchType ? styles.flex1 : undefined}>
+                    {filterInput}
+                    {shouldShowMerchantMatchType && (
+                        <MerchantMatchTypeSelector
+                            value={merchantOperator}
+                            onChange={setMerchantOperator}
+                        />
+                    )}
+                </View>
+            </NegatableFilter>
+            <Button
+                style={[styles.ph5, styles.pb5]}
+                variant={CONST.BUTTON_VARIANT.SUCCESS}
+                size={buttonSize}
+                onPress={updateMerchantFilter}
+            >
+                <Button.KeyboardShortcut />
+                <Button.Text>{translate('common.confirm')}</Button.Text>
+            </Button>
+        </View>
+    );
+}
+
+export default MerchantFilterContent;
+export type {MerchantFilterContentProps};
diff --git a/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
index fc62ace7f3de..f826386eccf4 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
@@ -12,10 +12,12 @@ import React from 'react';
 
 import type {AmountFilterContentProps} from './AmountFilterContent';
 import type {DateFilterContentProps} from './DateFilterContent';
+import type {MerchantFilterContentProps} from './MerchantFilterContent';
 import type {ReportFieldFilterContentProps} from './ReportFieldFilterContent';
 import type {TextInputFilterContentProps} from './TextInputFilterContent';
 
-type TextInputFilterContentWrapperProps = Pick<TextInputFilterContentProps, 'baseFilterKey' | 'value' | 'isNegated' | 'merchantOperator' | 'onChange'>;
+type TextInputFilterContentWrapperProps = Pick<TextInputFilterContentProps, 'baseFilterKey' | 'value' | 'isNegated' | 'onChange'>;
+type MerchantFilterContentWrapperProps = Pick<MerchantFilterContentProps, 'baseFilterKey' | 'value' | 'isNegated' | 'merchantOperator' | 'onChange'>;
 type AmountFilterContentWrapperProps = Pick<AmountFilterContentProps, 'baseFilterKey' | 'value' | 'onChange'>;
 type DateFilterContentWrapperProps = Pick<DateFilterContentProps, 'baseFilterKey' | 'value' | 'hasFeed' | 'onChange'>;
 type ReportFieldFilterContentWrapperProps = Pick<ReportFieldFilterContentProps, 'values' | 'onChange'>;
@@ -28,6 +30,7 @@ type SearchAdvancedFiltersContentProps = {
     values: Partial<SearchAdvancedFiltersForm> | undefined;
     ready?: boolean;
     components: {
+        Merchant: React.ComponentType<MerchantFilterContentWrapperProps>;
         Text: React.ComponentType<TextInputFilterContentWrapperProps>;
         Amount: React.ComponentType<AmountFilterContentWrapperProps>;
         Date: React.ComponentType<DateFilterContentWrapperProps>;
@@ -94,24 +97,33 @@ function SearchAdvancedFiltersContent({baseFilterKey, values, ready, components,
         );
     }
 
+    if (baseFilterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT) {
+        const MerchantFilter = components.Merchant;
+        const isNegated = !!values?.[FILTER_KEYS.MERCHANT_NOT];
+        const value = values?.[isNegated ? FILTER_KEYS.MERCHANT_NOT : FILTER_KEYS.MERCHANT];
+        const merchantOperator = values?.[FILTER_KEYS.MERCHANT_OPERATOR] ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS;
+        return (
+            <MerchantFilter
+                key={`${baseFilterKey}-${merchantOperator}`}
+                baseFilterKey={baseFilterKey}
+                value={value}
+                isNegated={isNegated}
+                merchantOperator={merchantOperator}
+                onChange={onChange}
+            />
+        );
+    }
+
     if (isTextFilterKey(baseFilterKey)) {
         const {isNegated, value} = getFilterNegatableValue(baseFilterKey, values);
         const TextFilter = components.Text;
-        const isMerchantFilter = baseFilterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT;
-        const merchantOperator = values?.[FILTER_KEYS.MERCHANT_OPERATOR] ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS;
         return (
             <TextFilter
-                key={isMerchantFilter ? `${baseFilterKey}-${merchantOperator}` : baseFilterKey}
+                key={baseFilterKey}
                 baseFilterKey={baseFilterKey}
                 value={value}
                 isNegated={isNegated}
-                merchantOperator={isMerchantFilter ? merchantOperator : undefined}
-                onChange={(newValue, negated, newMerchantOperator) =>
-                    onChange({
-                        ...getFilterFormValues(baseFilterKey, newValue, negated),
-                        ...(isMerchantFilter ? {[FILTER_KEYS.MERCHANT_OPERATOR]: newMerchantOperator ?? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO} : {}),
-                    })
-                }
+                onChange={(newValue, negated) => onChange(getFilterFormValues(baseFilterKey, newValue, negated))}
             />
         );
     }
@@ -133,4 +145,11 @@ function SearchAdvancedFiltersContent({baseFilterKey, values, ready, components,
 }
 
 export default SearchAdvancedFiltersContent;
-export type {TextInputFilterContentWrapperProps, AmountFilterContentWrapperProps, DateFilterContentWrapperProps, ReportFieldFilterContentWrapperProps, ListFilterContentWrapperProps};
+export type {
+    TextInputFilterContentWrapperProps,
+    MerchantFilterContentWrapperProps,
+    AmountFilterContentWrapperProps,
+    DateFilterContentWrapperProps,
+    ReportFieldFilterContentWrapperProps,
+    ListFilterContentWrapperProps,
+};
diff --git a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
index 40d2fc36922a..1cf9f64a4c7e 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
@@ -1,5 +1,4 @@
 import Button from '@components/ButtonComposed';
-import MerchantMatchTypeSelector from '@components/Search/FilterComponents/MerchantMatchTypeSelector';
 import NegatableFilter from '@components/Search/FilterComponents/NegatableFilter';
 import useTextFilterValidation from '@components/Search/hooks/useTextFilterValidation';
 import type {ReportFieldTextKey, SearchTextFilterKeys} from '@components/Search/types';
@@ -13,7 +12,6 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {FILTER_VIEW_MAP} from '@libs/SearchUIUtils';
 
 import CONST from '@src/CONST';
-import type {MerchantMatchType} from '@src/types/form/SearchAdvancedFiltersForm';
 
 import type {TextInput as RNTextInput, StyleProp, ViewStyle} from 'react-native';
 import type {ValueOf} from 'type-fest';
@@ -28,30 +26,18 @@ type TextInputFilterContentProps = {
     size?: Exclude<ValueOf<typeof CONST.BUTTON_SIZE>, typeof CONST.BUTTON_SIZE.SMALL>;
     autoFocus?: boolean;
     style?: StyleProp<ViewStyle>;
-    merchantOperator?: MerchantMatchType;
-    onChange: (value: string | undefined, isNegated: boolean, merchantOperator?: MerchantMatchType) => void;
+    onChange: (value: string | undefined, isNegated: boolean) => void;
 };
 
 function isTextInput(element: BaseTextInputRef | RNTextInput | null): element is RNTextInput {
     return !!element && 'isFocused' in element;
 }
 
-function TextInputFilterContent({
-    baseFilterKey,
-    value: initialValue,
-    isNegated: initialIsNegated,
-    autoFocus,
-    size,
-    style,
-    merchantOperator: initialMerchantOperator,
-    onChange,
-}: TextInputFilterContentProps) {
+function TextInputFilterContent({baseFilterKey, value: initialValue, isNegated: initialIsNegated, autoFocus, size, style, onChange}: TextInputFilterContentProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const [value, setValue] = useState(initialValue);
     const [isNegated, setIsNegated] = useState(initialIsNegated);
-    const shouldShowMerchantMatchType = baseFilterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT && !isNegated;
-    const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(initialMerchantOperator ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
     const label = translate(FILTER_VIEW_MAP[baseFilterKey].labelKey);
     const {inputCallbackRef} = useAutoFocusInput();
     const error = useTextFilterValidation(baseFilterKey, value);
@@ -71,7 +57,7 @@ function TextInputFilterContent({
             onChangeText={setValue}
             accessibilityLabel={label}
             role={CONST.ROLE.PRESENTATION}
-            containerStyles={shouldShowMerchantMatchType ? [styles.ph5, styles.mb5] : [styles.ph5]}
+            containerStyles={[styles.ph5]}
         />
     );
 
@@ -81,17 +67,8 @@ function TextInputFilterContent({
                 baseFilterKey={baseFilterKey}
                 isNegated={isNegated}
                 onNegationChange={setIsNegated}
-                style={shouldShowMerchantMatchType ? styles.flex1 : undefined}
             >
-                <View style={shouldShowMerchantMatchType ? styles.flex1 : undefined}>
-                    {filterInput}
-                    {shouldShowMerchantMatchType && (
-                        <MerchantMatchTypeSelector
-                            value={merchantOperator}
-                            onChange={setMerchantOperator}
-                        />
-                    )}
-                </View>
+                <View>{filterInput}</View>
             </NegatableFilter>
             <Button
                 style={[styles.ph5, styles.pb5]}
@@ -101,7 +78,7 @@ function TextInputFilterContent({
                     if (error) {
                         return;
                     }
-                    onChange(value, isNegated, shouldShowMerchantMatchType ? merchantOperator : undefined);
+                    onChange(value, isNegated);
                 }}
             >
                 <Button.KeyboardShortcut />
diff --git a/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/MerchantFilterContentPopupWrapper.tsx b/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/MerchantFilterContentPopupWrapper.tsx
new file mode 100644
index 000000000000..6f96b88e3ef0
--- /dev/null
+++ b/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/MerchantFilterContentPopupWrapper.tsx
@@ -0,0 +1,23 @@
+import MerchantFilterContent from '@components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent';
+import type {MerchantFilterContentWrapperProps} from '@components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent';
+
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import React from 'react';
+
+function MerchantFilterContentPopupWrapper({baseFilterKey, value, isNegated, merchantOperator, onChange}: MerchantFilterContentWrapperProps) {
+    const styles = useThemeStyles();
+
+    return (
+        <MerchantFilterContent
+            baseFilterKey={baseFilterKey}
+            value={value}
+            isNegated={isNegated}
+            merchantOperator={merchantOperator}
+            style={[styles.pt6]}
+            onChange={onChange}
+        />
+    );
+}
+
+export default MerchantFilterContentPopupWrapper;
diff --git a/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/TextInputFilterContentPopupWrapper.tsx b/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/TextInputFilterContentPopupWrapper.tsx
index cb1b0c44633f..acd3dd16c586 100644
--- a/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/TextInputFilterContentPopupWrapper.tsx
+++ b/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/TextInputFilterContentPopupWrapper.tsx
@@ -7,7 +7,7 @@ import {isFilterNegatable} from '@libs/SearchQueryUtils';
 
 import React from 'react';
 
-function TextInputFilterContentPopupWrapper({baseFilterKey, value, isNegated, merchantOperator, onChange}: TextInputFilterContentWrapperProps) {
+function TextInputFilterContentPopupWrapper({baseFilterKey, value, isNegated, onChange}: TextInputFilterContentWrapperProps) {
     const styles = useThemeStyles();
     const isFilterKeyNegatable = isFilterNegatable(baseFilterKey);
 
@@ -16,7 +16,6 @@ function TextInputFilterContentPopupWrapper({baseFilterKey, value, isNegated, me
             baseFilterKey={baseFilterKey}
             value={value}
             isNegated={isNegated}
-            merchantOperator={merchantOperator}
             style={[isFilterKeyNegatable ? styles.pt6 : styles.pt5]}
             onChange={onChange}
         />
diff --git a/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/index.tsx b/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/index.tsx
index eadcc3d4e5c9..a831b179dfe0 100644
--- a/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/index.tsx
+++ b/src/components/Search/FilterDropdowns/SearchAdvancedFiltersPopup/index.tsx
@@ -21,6 +21,7 @@ import {View} from 'react-native';
 import AmountFilterContentPopupWrapper from './AmountFilterContentPopupWrapper';
 import DateFilterContentPopupWrapper from './DateFilterContentPopupWrapper';
 import ListFilterContentPopupWrapper from './ListFilterContentPopupWrapper';
+import MerchantFilterContentPopupWrapper from './MerchantFilterContentPopupWrapper';
 import ReportFieldFilterContentPopupWrapper from './ReportFieldFilterContentPopupWrapper';
 import TextInputFilterContentPopupWrapper from './TextInputFilterContentPopupWrapper';
 
@@ -58,6 +59,7 @@ function SearchAdvancedFiltersPopup({queryJSON}: SearchAdvancedFiltersPopupProps
                         baseFilterKey={selectedFilter}
                         components={{
                             List: ListFilterContentPopupWrapper,
+                            Merchant: MerchantFilterContentPopupWrapper,
                             Text: TextInputFilterContentPopupWrapper,
                             Amount: AmountFilterContentPopupWrapper,
                             Date: DateFilterContentPopupWrapper,
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index 4b5b2e3796c9..260887576c45 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -365,13 +365,16 @@ function buildAmountFilterQuery(filterKey: SearchAmountFilterKeys, filterValues:
 function buildFilterValuesString(filterName: string, queryFilters: QueryFilter[]) {
     const delimiter = filterName === CONST.SEARCH.SYNTAX_FILTER_KEYS.KEYWORD ? ' ' : ',';
     const allowedOps = new Set<string>([CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO]);
+    if (filterName === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT) {
+        allowedOps.add(CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
+    }
 
     let filterValueString = '';
     for (const [index, queryFilter] of queryFilters.entries()) {
         const previousValueHasSameOp = allowedOps.has(queryFilter.operator) && queryFilters?.at(index - 1)?.operator === queryFilter.operator;
         const nextValueHasSameOp = allowedOps.has(queryFilter.operator) && queryFilters?.at(index + 1)?.operator === queryFilter.operator;
 
-        // If the previous queryFilter has the same operator (this rule applies only to eq and neq operators) then append the current value
+        // If the previous queryFilter has the same operator and that operator supports comma-delimited values, append the current value
         if (filterName === CONST.SEARCH.SYNTAX_FILTER_KEYS.KEYWORD) {
             filterValueString += `${delimiter}${escapeKeyword(sanitizeSearchValue(queryFilter.value.toString()))}`;
         } else if (index !== 0 && (previousValueHasSameOp || nextValueHasSameOp)) {
diff --git a/src/pages/Search/SearchAdvancedFiltersContentPage/MerchantFilterContentPageWrapper.tsx b/src/pages/Search/SearchAdvancedFiltersContentPage/MerchantFilterContentPageWrapper.tsx
new file mode 100644
index 000000000000..a0b2c9899f57
--- /dev/null
+++ b/src/pages/Search/SearchAdvancedFiltersContentPage/MerchantFilterContentPageWrapper.tsx
@@ -0,0 +1,22 @@
+import MerchantFilterContent from '@components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent';
+import type {MerchantFilterContentWrapperProps} from '@components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent';
+
+import CONST from '@src/CONST';
+
+import React from 'react';
+
+function MerchantFilterContentPageWrapper({baseFilterKey, value, isNegated, merchantOperator, onChange}: MerchantFilterContentWrapperProps) {
+    return (
+        <MerchantFilterContent
+            baseFilterKey={baseFilterKey}
+            value={value}
+            isNegated={isNegated}
+            merchantOperator={merchantOperator}
+            buttonSize={CONST.BUTTON_SIZE.LARGE}
+            autoFocus
+            onChange={onChange}
+        />
+    );
+}
+
+export default MerchantFilterContentPageWrapper;
diff --git a/src/pages/Search/SearchAdvancedFiltersContentPage/SearchAdvancedFiltersContentBase.tsx b/src/pages/Search/SearchAdvancedFiltersContentPage/SearchAdvancedFiltersContentBase.tsx
index 8a31225995c7..c92990946ee5 100644
--- a/src/pages/Search/SearchAdvancedFiltersContentPage/SearchAdvancedFiltersContentBase.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersContentPage/SearchAdvancedFiltersContentBase.tsx
@@ -24,6 +24,7 @@ import {View} from 'react-native';
 import AmountFilterContentPageWrapper from './AmountFilterContentPageWrapper';
 import DateFilterContentPageWrapper from './DateFilterContentPageWrapper';
 import ListFilterContentPageWrapper from './ListFilterContentPageWrapper';
+import MerchantFilterContentPageWrapper from './MerchantFilterContentPageWrapper';
 import ReportFieldFilterContentPageWrapper from './ReportFieldFilterContentPageWrapper';
 import TextInputFilterContentPageWrapper from './TextInputFilterContentPageWrapper';
 
@@ -68,6 +69,7 @@ function SearchAdvancedFiltersContentBase() {
                                 ready={didScreenTransitionEnd}
                                 components={{
                                     List: ListFilterContentPageWrapper,
+                                    Merchant: MerchantFilterContentPageWrapper,
                                     Text: TextInputFilterContentPageWrapper,
                                     Amount: AmountFilterContentPageWrapper,
                                     Date: DateFilterContentPageWrapper,
diff --git a/src/pages/Search/SearchAdvancedFiltersContentPage/TextInputFilterContentPageWrapper.tsx b/src/pages/Search/SearchAdvancedFiltersContentPage/TextInputFilterContentPageWrapper.tsx
index 60d47b6fb35a..d2b9a605ab27 100644
--- a/src/pages/Search/SearchAdvancedFiltersContentPage/TextInputFilterContentPageWrapper.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersContentPage/TextInputFilterContentPageWrapper.tsx
@@ -5,13 +5,12 @@ import CONST from '@src/CONST';
 
 import React from 'react';
 
-function TextInputFilterContentPageWrapper({baseFilterKey, value, isNegated, merchantOperator, onChange}: TextInputFilterContentWrapperProps) {
+function TextInputFilterContentPageWrapper({baseFilterKey, value, isNegated, onChange}: TextInputFilterContentWrapperProps) {
     return (
         <TextInputFilterContent
             baseFilterKey={baseFilterKey}
             value={value}
             isNegated={isNegated}
-            merchantOperator={merchantOperator}
             autoFocus
             size={CONST.BUTTON_SIZE.LARGE}
             onChange={onChange}
diff --git a/tests/ui/MerchantFilterContentTest.tsx b/tests/ui/MerchantFilterContentTest.tsx
new file mode 100644
index 000000000000..fb56e7b1a4a9
--- /dev/null
+++ b/tests/ui/MerchantFilterContentTest.tsx
@@ -0,0 +1,111 @@
+import {fireEvent, render, screen} from '@testing-library/react-native';
+
+import MerchantFilterContent from '@components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent';
+
+import CONST from '@src/CONST';
+import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
+
+import {NavigationContainer} from '@react-navigation/native';
+
+jest.mock('@hooks/useAutoFocusInput', () => () => ({inputCallbackRef: jest.fn()}));
+jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
+
+function renderMerchantFilter(onChange = jest.fn(), merchantOperator = CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS) {
+    return {
+        onChange,
+        ...render(
+            <NavigationContainer>
+                <MerchantFilterContent
+                    baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}
+                    value="I"
+                    isNegated={false}
+                    merchantOperator={merchantOperator}
+                    onChange={onChange}
+                />
+            </NavigationContainer>,
+        ),
+    };
+}
+
+describe('MerchantFilterContent', () => {
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('keeps the merchant input fixed above the match type options', () => {
+        const {onChange} = renderMerchantFilter();
+        const merchantInput = screen.getByLabelText('common.merchant');
+
+        expect(screen.getByText('search.filters.merchant.matchType')).toBeOnTheScreen();
+        expect(screen.getByText('search.filters.merchant.contains')).toBeOnTheScreen();
+        expect(screen.getByText('search.filters.merchant.exactMatch')).toBeOnTheScreen();
+
+        fireEvent.changeText(merchantInput, 'Ibis');
+        fireEvent.press(screen.getByText('search.filters.merchant.exactMatch'));
+
+        expect(screen.getByLabelText('common.merchant')).toBe(merchantInput);
+        expect(screen.getByDisplayValue('Ibis')).toBeOnTheScreen();
+
+        fireEvent.press(screen.getByText('common.confirm'));
+
+        expect(onChange).toHaveBeenCalledWith({
+            [FILTER_KEYS.MERCHANT]: 'Ibis',
+            [FILTER_KEYS.MERCHANT_NOT]: undefined,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+        });
+    });
+
+    it('submits the selected Contains operator', () => {
+        const {onChange} = renderMerchantFilter();
+
+        fireEvent.press(screen.getByText('common.confirm'));
+
+        expect(onChange).toHaveBeenCalledWith({
+            [FILTER_KEYS.MERCHANT]: 'I',
+            [FILTER_KEYS.MERCHANT_NOT]: undefined,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+        });
+    });
+
+    it('defaults to Contains when no Merchant operator is stored', () => {
+        const onChange = jest.fn();
+        render(
+            <NavigationContainer>
+                <MerchantFilterContent
+                    baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}
+                    value="I"
+                    isNegated={false}
+                    onChange={onChange}
+                />
+            </NavigationContainer>,
+        );
+
+        fireEvent.press(screen.getByText('common.confirm'));
+
+        expect(onChange).toHaveBeenCalledWith({
+            [FILTER_KEYS.MERCHANT]: 'I',
+            [FILTER_KEYS.MERCHANT_NOT]: undefined,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+        });
+    });
+
+    it('hides match type controls and uses exact matching when the filter is negated', () => {
+        const {onChange} = renderMerchantFilter();
+        const merchantInput = screen.getByLabelText('common.merchant');
+
+        fireEvent.press(screen.getByText('search.filters.filterType.is.negative'));
+
+        expect(screen.queryByText('search.filters.merchant.matchType')).not.toBeOnTheScreen();
+        expect(screen.queryByText('search.filters.merchant.contains')).not.toBeOnTheScreen();
+        expect(screen.queryByText('search.filters.merchant.exactMatch')).not.toBeOnTheScreen();
+        expect(screen.getByLabelText('common.merchant')).toBe(merchantInput);
+
+        fireEvent.press(screen.getByText('common.confirm'));
+
+        expect(onChange).toHaveBeenCalledWith({
+            [FILTER_KEYS.MERCHANT]: undefined,
+            [FILTER_KEYS.MERCHANT_NOT]: 'I',
+            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+        });
+    });
+});
diff --git a/tests/ui/TextInputFilterContentTest.tsx b/tests/ui/TextInputFilterContentTest.tsx
index 6e7fce3da3e0..62879fa431a7 100644
--- a/tests/ui/TextInputFilterContentTest.tsx
+++ b/tests/ui/TextInputFilterContentTest.tsx
@@ -9,16 +9,15 @@ import {NavigationContainer} from '@react-navigation/native';
 jest.mock('@hooks/useAutoFocusInput', () => () => ({inputCallbackRef: jest.fn()}));
 jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
 
-function renderMerchantFilter(onChange = jest.fn(), hasStoredMerchantOperator = true) {
+function renderDescriptionFilter(onChange = jest.fn()) {
     return {
         onChange,
         ...render(
             <NavigationContainer>
                 <TextInputFilterContent
-                    baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}
+                    baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.DESCRIPTION}
                     value="I"
                     isNegated={false}
-                    merchantOperator={hasStoredMerchantOperator ? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS : undefined}
                     onChange={onChange}
                 />
             </NavigationContainer>,
@@ -31,66 +30,13 @@ describe('TextInputFilterContent', () => {
         jest.clearAllMocks();
     });
 
-    it('keeps the merchant input fixed above the Rules match type options', () => {
-        // Given a positive Merchant Contains filter using the Rules layout.
-        const {onChange} = renderMerchantFilter();
-        const merchantInput = screen.getByLabelText('common.merchant');
+    it('submits a generic Description filter with two onChange arguments and no match type selector', () => {
+        const {onChange} = renderDescriptionFilter();
 
-        expect(screen.getByText('search.filters.merchant.matchType')).toBeOnTheScreen();
-        expect(screen.getByText('search.filters.merchant.contains')).toBeOnTheScreen();
-        expect(screen.getByText('search.filters.merchant.exactMatch')).toBeOnTheScreen();
-
-        // When the user edits the input and changes the match type.
-        fireEvent.changeText(merchantInput, 'Ibis');
-        fireEvent.press(screen.getByText('search.filters.merchant.exactMatch'));
-
-        // Then the input stays mounted with its current value.
-        expect(screen.getByLabelText('common.merchant')).toBe(merchantInput);
-        expect(screen.getByDisplayValue('Ibis')).toBeOnTheScreen();
-
-        fireEvent.press(screen.getByText('common.confirm'));
-
-        expect(onChange).toHaveBeenCalledWith('Ibis', false, CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
-    });
-
-    it('submits the selected Contains operator from the Rules layout', () => {
-        const {onChange} = renderMerchantFilter();
-
-        fireEvent.press(screen.getByText('common.confirm'));
-
-        expect(onChange).toHaveBeenCalledWith('I', false, CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
-    });
-
-    it('defaults to Contains when no Merchant operator is stored', () => {
-        const {onChange} = renderMerchantFilter(jest.fn(), false);
-
-        fireEvent.press(screen.getByText('common.confirm'));
-
-        expect(onChange).toHaveBeenCalledWith('I', false, CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
-    });
-
-    it('hides the merchant match type and omits the operator when the filter is negated', () => {
-        // Given a positive Merchant Contains filter where both match options must be available.
-        const {onChange} = renderMerchantFilter();
-        const merchantInput = screen.getByLabelText('common.merchant');
-
-        expect(screen.getByText('search.filters.merchant.matchType')).toBeOnTheScreen();
-        expect(screen.getByText('search.filters.merchant.contains')).toBeOnTheScreen();
-        expect(screen.getByText('search.filters.merchant.exactMatch')).toBeOnTheScreen();
-
-        // When the user negates the filter because negated Merchant searches only support exact matching.
-        fireEvent.press(screen.getByText('search.filters.filterType.is.negative'));
-
-        // Then match options disappear so the UI matches the submitted query.
         expect(screen.queryByText('search.filters.merchant.matchType')).not.toBeOnTheScreen();
-        expect(screen.queryByText('search.filters.merchant.contains')).not.toBeOnTheScreen();
-        expect(screen.queryByText('search.filters.merchant.exactMatch')).not.toBeOnTheScreen();
-        expect(screen.getByLabelText('common.merchant')).toBe(merchantInput);
-
-        // When the user confirms the negated filter after match options disappear.
         fireEvent.press(screen.getByText('common.confirm'));
 
-        // Then no Merchant operator is submitted because negated searches only support exact matching.
-        expect(onChange).toHaveBeenCalledWith('I', true, undefined);
+        expect(onChange).toHaveBeenCalledWith('I', false);
+        expect(onChange.mock.calls.at(0)).toHaveLength(2);
     });
 });
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index fb8c09f0e15c..362308c7ec96 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -3514,6 +3514,91 @@ describe('SearchQueryUtils', () => {
         return null;
     }
 
+    describe('merchant multi-value query serialization', () => {
+        test.each(['merchant*:Amazon,Uber', 'merchant:Amazon,Uber'])('preserves array AST for %s', (input) => {
+            const queryJSON = buildSearchQueryJSON(input);
+            if (!queryJSON?.filters) {
+                throw new Error('Expected merchant filters to be defined');
+            }
+
+            const merchantNode = findNode(queryJSON.filters, CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT);
+            if (!merchantNode) {
+                throw new Error('Expected merchant node to be found in AST');
+            }
+
+            expect(merchantNode.operator).toBe(CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
+            expect(merchantNode.right).toEqual(['Amazon', 'Uber']);
+
+            const builtQuery = buildSearchQueryString(queryJSON);
+            const updatedQuery = getQueryWithUpdatedValues(input, true);
+            if (!updatedQuery) {
+                throw new Error('Expected updated query to be defined');
+            }
+
+            expect(updatedQuery).toBe(builtQuery);
+            expect(buildSearchQueryJSON(builtQuery)?.filters).toEqual(queryJSON.filters);
+            expect(buildSearchQueryJSON(updatedQuery)?.filters).toEqual(queryJSON.filters);
+
+            const canonicalQueryJSON = buildSearchQueryJSON(updatedQuery);
+            if (!canonicalQueryJSON?.filters) {
+                throw new Error('Expected canonical merchant filters to be defined');
+            }
+
+            expect(serializeQueryJSONForBackend(canonicalQueryJSON)).toBe(JSON.stringify({...canonicalQueryJSON, status: ''}));
+            expect(getQueryWithUpdatedValues(updatedQuery, true)).toBe(updatedQuery);
+            expect(buildSearchQueryString(buildSearchQueryJSON(updatedQuery))).toBe(updatedQuery);
+        });
+
+        test.each([
+            ['merchant=Amazon,Uber', CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, ['Amazon', 'Uber'], 'merchant=Amazon,Uber'],
+            ['-merchant:Amazon,Uber', CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO, ['Amazon', 'Uber'], '-merchant:Amazon,Uber'],
+            ['merchant*:Amazon', CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS, 'Amazon', 'merchant*:Amazon'],
+            ['merchant*:"Amazon,Uber"', CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS, 'Amazon,Uber', 'merchant*:"Amazon,Uber"'],
+        ])('keeps merchant operator semantics for %s', (input, operator, value, expectedQuery) => {
+            const queryJSON = buildSearchQueryJSON(input);
+            if (!queryJSON?.filters) {
+                throw new Error('Expected merchant filters to be defined');
+            }
+
+            const merchantNode = findNode(queryJSON.filters, CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT);
+            if (!merchantNode) {
+                throw new Error('Expected merchant node to be found in AST');
+            }
+
+            expect(merchantNode.operator).toBe(operator);
+            expect(merchantNode.right).toEqual(value);
+            const rebuiltQueryString = buildSearchQueryString(queryJSON);
+            expect(rebuiltQueryString).toContain(expectedQuery);
+            expect(buildSearchQueryJSON(rebuiltQueryString)?.filters).toEqual(queryJSON.filters);
+        });
+
+        test('preserves separate merchant contains filters when rebuilding', () => {
+            const queryJSON = buildSearchQueryJSON('merchant*:Amazon merchant*:Uber');
+            if (!queryJSON?.filters) {
+                throw new Error('Expected merchant query to be defined');
+            }
+
+            expect(queryJSON.filters.operator).toBe(CONST.SEARCH.SYNTAX_OPERATORS.AND);
+            expect(buildSearchQueryJSON(buildSearchQueryString(queryJSON))?.filters).toEqual(queryJSON.filters);
+        });
+
+        test('keeps category comma lists on the exact operator', () => {
+            const queryJSON = buildSearchQueryJSON('category:Travel,Meals');
+            if (!queryJSON?.filters) {
+                throw new Error('Expected category filters to be defined');
+            }
+
+            const categoryNode = findNode(queryJSON.filters, CONST.SEARCH.SYNTAX_FILTER_KEYS.CATEGORY);
+            if (!categoryNode) {
+                throw new Error('Expected category node to be found in AST');
+            }
+
+            expect(categoryNode.operator).toBe(CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
+            expect(categoryNode.right).toEqual(['Travel', 'Meals']);
+            expect(buildSearchQueryString(queryJSON)).toContain('category:Travel,Meals');
+        });
+    });
+
     describe('applyContainsOperatorToTextFields', () => {
         it('should preserve explicit merchant eq as exact match', () => {
             const queryJSON = buildSearchQueryJSON('type:expense merchant=coffee');

From 7fb75a9016f0731132d433aada05aee3445dd704 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Tue, 8 Sep 2026 03:14:53 +0700
Subject: [PATCH 24/38] refactor(search): isolate merchant filter chip popup

---
 .../FilterDropdowns/MerchantFilterPopup.tsx   |  99 ++++++++++++++++
 .../FilterDropdowns/TextFilterPopup.tsx       |  31 +----
 .../SearchPageHeader/useSearchFiltersBar.tsx  |  13 +++
 tests/ui/MerchantFilterPopupTest.tsx          | 107 ++++++++++++++++++
 tests/ui/TextFilterPopupTest.tsx              |  86 ++++----------
 5 files changed, 243 insertions(+), 93 deletions(-)
 create mode 100644 src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx
 create mode 100644 tests/ui/MerchantFilterPopupTest.tsx

diff --git a/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx b/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx
new file mode 100644
index 000000000000..bdf6574e9307
--- /dev/null
+++ b/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx
@@ -0,0 +1,99 @@
+/**
+ * Edits the Merchant filter value and match type from its search filter chip.
+ */
+import MerchantMatchTypeSelector from '@components/Search/FilterComponents/MerchantMatchTypeSelector';
+import NegatableFilter from '@components/Search/FilterComponents/NegatableFilter';
+import useTextFilterValidation from '@components/Search/hooks/useTextFilterValidation';
+import TextInput from '@components/TextInput';
+
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {getFilterFormValues} from '@libs/SearchQueryUtils';
+import {getFilterNegatableValue} from '@libs/SearchUIUtils';
+
+import CONST from '@src/CONST';
+import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
+import type {MerchantMatchType, SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
+
+import React, {useState} from 'react';
+import {View} from 'react-native';
+
+import type {PopoverComponentProps} from './FilterPopupButton';
+
+import BasePopup from './BasePopup';
+
+type MerchantFilterPopupProps = {
+    /** The Merchant filter key. */
+    baseFilterKey: typeof CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT;
+    /** The current search filter form values. */
+    values: Partial<SearchAdvancedFiltersForm> | undefined;
+    /** The translated filter label. */
+    label: string;
+    /** Closes the filter popup. */
+    closeOverlay: PopoverComponentProps['closeOverlay'];
+    /** Applies the updated Merchant filter values. */
+    updateFilterForm: (value: Partial<SearchAdvancedFiltersForm>) => void;
+};
+
+function MerchantFilterPopup({baseFilterKey, values, label, updateFilterForm, closeOverlay}: MerchantFilterPopupProps) {
+    const styles = useThemeStyles();
+
+    const {isNegated: initialIsNegated, value: initialValue} = getFilterNegatableValue(baseFilterKey, values);
+    const [isNegated, setIsNegated] = useState(initialIsNegated);
+    const [value, setValue] = useState(initialValue);
+    const shouldShowMerchantMatchType = !isNegated;
+    const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(values?.[FILTER_KEYS.MERCHANT_OPERATOR] ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
+
+    const error = useTextFilterValidation(baseFilterKey, value);
+    const filterInput = (
+        <TextInput
+            placeholder={label}
+            value={value}
+            errorText={error}
+            hasError={!!error}
+            onChangeText={setValue}
+            accessibilityLabel={label}
+            role={CONST.ROLE.PRESENTATION}
+            containerStyles={shouldShowMerchantMatchType ? [styles.ph5, styles.mb5] : [styles.ph5]}
+        />
+    );
+
+    const applyChanges = () => {
+        if (error) {
+            return;
+        }
+        updateFilterForm({
+            ...getFilterFormValues(baseFilterKey, value, isNegated),
+            [FILTER_KEYS.MERCHANT_OPERATOR]: isNegated ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO : merchantOperator,
+        });
+        closeOverlay();
+    };
+
+    return (
+        <BasePopup
+            label={label}
+            onApply={applyChanges}
+            applySentryLabel={`Search-FilterPopupApply-${baseFilterKey}`}
+        >
+            <NegatableFilter
+                baseFilterKey={baseFilterKey}
+                isNegated={isNegated}
+                onNegationChange={setIsNegated}
+            >
+                {shouldShowMerchantMatchType ? (
+                    <View>
+                        {filterInput}
+                        <MerchantMatchTypeSelector
+                            value={merchantOperator}
+                            onChange={setMerchantOperator}
+                        />
+                    </View>
+                ) : (
+                    filterInput
+                )}
+            </NegatableFilter>
+        </BasePopup>
+    );
+}
+
+export default MerchantFilterPopup;
diff --git a/src/components/Search/FilterDropdowns/TextFilterPopup.tsx b/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
index 50be29f732eb..09968781f5a5 100644
--- a/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
+++ b/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
@@ -1,4 +1,3 @@
-import MerchantMatchTypeSelector from '@components/Search/FilterComponents/MerchantMatchTypeSelector';
 import NegatableFilter from '@components/Search/FilterComponents/NegatableFilter';
 import useTextFilterValidation from '@components/Search/hooks/useTextFilterValidation';
 import type {ReportFieldTextKey, SearchTextFilterKeys} from '@components/Search/types';
@@ -10,18 +9,16 @@ import {getFilterFormValues} from '@libs/SearchQueryUtils';
 import {getFilterNegatableValue} from '@libs/SearchUIUtils';
 
 import CONST from '@src/CONST';
-import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
-import type {MerchantMatchType, SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
+import type {SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
 
 import React, {useState} from 'react';
-import {View} from 'react-native';
 
 import type {PopoverComponentProps} from './FilterPopupButton';
 
 import BasePopup from './BasePopup';
 
 type TextFilterPopupProps = {
-    baseFilterKey: Exclude<SearchTextFilterKeys, typeof CONST.SEARCH.SYNTAX_ROOT_KEYS.LIMIT | ReportFieldTextKey>;
+    baseFilterKey: Exclude<SearchTextFilterKeys, typeof CONST.SEARCH.SYNTAX_ROOT_KEYS.LIMIT | typeof CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT | ReportFieldTextKey>;
     values: Partial<SearchAdvancedFiltersForm> | undefined;
     label: string;
     closeOverlay: PopoverComponentProps['closeOverlay'];
@@ -34,9 +31,6 @@ function TextFilterPopup({baseFilterKey, values, label, updateFilterForm, closeO
     const {isNegated: initialIsNegated, value: initialValue} = getFilterNegatableValue(baseFilterKey, values);
     const [isNegated, setIsNegated] = useState(initialIsNegated);
     const [value, setValue] = useState(initialValue);
-    const isMerchantFilter = baseFilterKey === FILTER_KEYS.MERCHANT;
-    const shouldShowMerchantMatchType = isMerchantFilter && !isNegated;
-    const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(values?.[FILTER_KEYS.MERCHANT_OPERATOR] ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
 
     const error = useTextFilterValidation(baseFilterKey, value);
     const filterInput = (
@@ -48,7 +42,7 @@ function TextFilterPopup({baseFilterKey, values, label, updateFilterForm, closeO
             onChangeText={setValue}
             accessibilityLabel={label}
             role={CONST.ROLE.PRESENTATION}
-            containerStyles={shouldShowMerchantMatchType ? [styles.ph5, styles.mb5] : [styles.ph5]}
+            containerStyles={[styles.ph5]}
         />
     );
 
@@ -56,12 +50,7 @@ function TextFilterPopup({baseFilterKey, values, label, updateFilterForm, closeO
         if (error) {
             return;
         }
-        updateFilterForm({
-            ...getFilterFormValues(baseFilterKey, value, isNegated),
-            ...(isMerchantFilter && {
-                [FILTER_KEYS.MERCHANT_OPERATOR]: shouldShowMerchantMatchType ? merchantOperator : CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
-            }),
-        });
+        updateFilterForm(getFilterFormValues(baseFilterKey, value, isNegated));
         closeOverlay();
     };
 
@@ -76,17 +65,7 @@ function TextFilterPopup({baseFilterKey, values, label, updateFilterForm, closeO
                 isNegated={isNegated}
                 onNegationChange={setIsNegated}
             >
-                {shouldShowMerchantMatchType ? (
-                    <View>
-                        {filterInput}
-                        <MerchantMatchTypeSelector
-                            value={merchantOperator}
-                            onChange={setMerchantOperator}
-                        />
-                    </View>
-                ) : (
-                    filterInput
-                )}
+                {filterInput}
             </NegatableFilter>
         </BasePopup>
     );
diff --git a/src/components/Search/SearchPageHeader/useSearchFiltersBar.tsx b/src/components/Search/SearchPageHeader/useSearchFiltersBar.tsx
index ecfbbd72163c..8caddba0b7b5 100644
--- a/src/components/Search/SearchPageHeader/useSearchFiltersBar.tsx
+++ b/src/components/Search/SearchPageHeader/useSearchFiltersBar.tsx
@@ -2,6 +2,7 @@ import {ListFilterHeightContextProvider} from '@components/Search/FilterComponen
 import AmountPopup from '@components/Search/FilterDropdowns/AmountPopup';
 import type {PopoverComponentProps} from '@components/Search/FilterDropdowns/FilterPopupButton';
 import ListPopup from '@components/Search/FilterDropdowns/ListPopup';
+import MerchantFilterPopup from '@components/Search/FilterDropdowns/MerchantFilterPopup';
 import ReportFieldPopup from '@components/Search/FilterDropdowns/ReportFieldPopup';
 import TextFilterPopup from '@components/Search/FilterDropdowns/TextFilterPopup';
 import useUpdateFilterQuery from '@components/Search/hooks/useUpdateFilterQuery';
@@ -112,6 +113,18 @@ function FilterPopup({baseFilterKey, searchAdvancedFiltersForm, closeOverlay, se
         );
     }
 
+    if (baseFilterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT) {
+        return (
+            <MerchantFilterPopup
+                baseFilterKey={baseFilterKey}
+                values={searchAdvancedFiltersForm}
+                closeOverlay={closeOverlay}
+                label={label}
+                updateFilterForm={closeModalAndUpdateFilterForm}
+            />
+        );
+    }
+
     if (isTextFilterKey(baseFilterKey)) {
         return (
             <TextFilterPopup
diff --git a/tests/ui/MerchantFilterPopupTest.tsx b/tests/ui/MerchantFilterPopupTest.tsx
new file mode 100644
index 000000000000..a69b136114c6
--- /dev/null
+++ b/tests/ui/MerchantFilterPopupTest.tsx
@@ -0,0 +1,107 @@
+import {fireEvent, render, screen} from '@testing-library/react-native';
+
+import MerchantFilterPopup from '@components/Search/FilterDropdowns/MerchantFilterPopup';
+
+import CONST from '@src/CONST';
+import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
+import type {SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
+
+import {NavigationContainer} from '@react-navigation/native';
+
+jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
+jest.mock('@hooks/useResponsiveLayout', () => () => ({isSmallScreenWidth: false}));
+
+function renderMerchantPopup(hasStoredMerchantOperator = true, values: Partial<SearchAdvancedFiltersForm> = {}) {
+    const closeOverlay = jest.fn();
+    const updateFilterForm = jest.fn<void, [Partial<SearchAdvancedFiltersForm>]>();
+
+    const rendered = render(
+        <NavigationContainer>
+            <MerchantFilterPopup
+                baseFilterKey={FILTER_KEYS.MERCHANT}
+                values={{
+                    [FILTER_KEYS.MERCHANT]: 'I',
+                    ...(hasStoredMerchantOperator ? {[FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS} : {}),
+                    ...values,
+                }}
+                label="common.merchant"
+                closeOverlay={closeOverlay}
+                updateFilterForm={updateFilterForm}
+            />
+        </NavigationContainer>,
+    );
+
+    return {closeOverlay, updateFilterForm, ...rendered};
+}
+
+describe('MerchantFilterPopup', () => {
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('shows and submits the Merchant match type', () => {
+        const {closeOverlay, updateFilterForm} = renderMerchantPopup();
+
+        expect(screen.getByText('search.filters.merchant.matchType')).toBeOnTheScreen();
+        expect(screen.getByText('search.filters.merchant.contains')).toBeOnTheScreen();
+        expect(screen.getByText('search.filters.merchant.exactMatch')).toBeOnTheScreen();
+
+        fireEvent.press(screen.getByText('search.filters.merchant.exactMatch'));
+        fireEvent.press(screen.getByText('common.apply'));
+
+        expect(updateFilterForm).toHaveBeenCalledWith({
+            [FILTER_KEYS.MERCHANT]: 'I',
+            [FILTER_KEYS.MERCHANT_NOT]: undefined,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+        });
+        expect(closeOverlay).toHaveBeenCalledTimes(1);
+    });
+
+    it('keeps the exact operator and edited value when reopened', () => {
+        const first = renderMerchantPopup();
+        fireEvent.changeText(screen.getByLabelText('common.merchant'), 'Ibis');
+        fireEvent.press(screen.getByText('search.filters.merchant.exactMatch'));
+        fireEvent.press(screen.getByText('common.apply'));
+        const savedValues = first.updateFilterForm.mock.calls.at(0)?.at(0);
+        first.unmount();
+
+        const reopened = renderMerchantPopup(true, savedValues);
+        expect(screen.getByDisplayValue('Ibis')).toBeOnTheScreen();
+        fireEvent.press(screen.getByText('common.apply'));
+        expect(reopened.updateFilterForm).toHaveBeenCalledWith({
+            [FILTER_KEYS.MERCHANT]: 'Ibis',
+            [FILTER_KEYS.MERCHANT_NOT]: undefined,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+        });
+    });
+
+    it('defaults to Contains when no Merchant operator is stored', () => {
+        const {updateFilterForm} = renderMerchantPopup(false);
+
+        fireEvent.press(screen.getByText('common.apply'));
+
+        expect(updateFilterForm).toHaveBeenCalledWith({
+            [FILTER_KEYS.MERCHANT]: 'I',
+            [FILTER_KEYS.MERCHANT_NOT]: undefined,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+        });
+    });
+
+    it('hides the match type and submits exact matching for a negated Merchant', () => {
+        const {updateFilterForm} = renderMerchantPopup();
+
+        fireEvent.press(screen.getByText('search.filters.filterType.is.negative'));
+
+        expect(screen.queryByText('search.filters.merchant.matchType')).not.toBeOnTheScreen();
+        expect(screen.queryByText('search.filters.merchant.contains')).not.toBeOnTheScreen();
+        expect(screen.queryByText('search.filters.merchant.exactMatch')).not.toBeOnTheScreen();
+
+        fireEvent.press(screen.getByText('common.apply'));
+
+        expect(updateFilterForm).toHaveBeenCalledWith({
+            [FILTER_KEYS.MERCHANT]: undefined,
+            [FILTER_KEYS.MERCHANT_NOT]: 'I',
+            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+        });
+    });
+});
diff --git a/tests/ui/TextFilterPopupTest.tsx b/tests/ui/TextFilterPopupTest.tsx
index 9da812158edc..d1b9872b9ae1 100644
--- a/tests/ui/TextFilterPopupTest.tsx
+++ b/tests/ui/TextFilterPopupTest.tsx
@@ -2,7 +2,6 @@ import {fireEvent, render, screen} from '@testing-library/react-native';
 
 import TextFilterPopup from '@components/Search/FilterDropdowns/TextFilterPopup';
 
-import CONST from '@src/CONST';
 import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
 
 import {NavigationContainer} from '@react-navigation/native';
@@ -10,78 +9,31 @@ import {NavigationContainer} from '@react-navigation/native';
 jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
 jest.mock('@hooks/useResponsiveLayout', () => () => ({isSmallScreenWidth: false}));
 
-function renderMerchantPopup(hasStoredMerchantOperator = true) {
-    const closeOverlay = jest.fn();
-    const updateFilterForm = jest.fn();
-
-    render(
-        <NavigationContainer>
-            <TextFilterPopup
-                baseFilterKey={FILTER_KEYS.MERCHANT}
-                values={{
-                    [FILTER_KEYS.MERCHANT]: 'I',
-                    ...(hasStoredMerchantOperator ? {[FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS} : {}),
-                }}
-                label="common.merchant"
-                closeOverlay={closeOverlay}
-                updateFilterForm={updateFilterForm}
-            />
-        </NavigationContainer>,
-    );
-
-    return {closeOverlay, updateFilterForm};
-}
-
 describe('TextFilterPopup', () => {
-    afterEach(() => {
-        jest.clearAllMocks();
-    });
-
-    it('shows and submits the Merchant match type', () => {
-        const {closeOverlay, updateFilterForm} = renderMerchantPopup();
-
-        expect(screen.getByText('search.filters.merchant.matchType')).toBeOnTheScreen();
-        expect(screen.getByText('search.filters.merchant.contains')).toBeOnTheScreen();
-        expect(screen.getByText('search.filters.merchant.exactMatch')).toBeOnTheScreen();
-
-        fireEvent.press(screen.getByText('search.filters.merchant.exactMatch'));
-        fireEvent.press(screen.getByText('common.apply'));
-
-        expect(updateFilterForm).toHaveBeenCalledWith({
-            [FILTER_KEYS.MERCHANT]: 'I',
-            [FILTER_KEYS.MERCHANT_NOT]: undefined,
-            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
-        });
-        expect(closeOverlay).toHaveBeenCalledTimes(1);
-    });
-
-    it('defaults to Contains when no Merchant operator is stored', () => {
-        const {updateFilterForm} = renderMerchantPopup(false);
-
-        fireEvent.press(screen.getByText('common.apply'));
-
-        expect(updateFilterForm).toHaveBeenCalledWith({
-            [FILTER_KEYS.MERCHANT]: 'I',
-            [FILTER_KEYS.MERCHANT_NOT]: undefined,
-            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
-        });
-    });
-
-    it('hides the match type and submits exact matching for a negated Merchant', () => {
-        const {updateFilterForm} = renderMerchantPopup();
-
-        fireEvent.press(screen.getByText('search.filters.filterType.is.negative'));
+    it.each([FILTER_KEYS.DESCRIPTION, FILTER_KEYS.TITLE])('applies the %s text filter without Merchant fields', (baseFilterKey) => {
+        const closeOverlay = jest.fn();
+        const updateFilterForm = jest.fn();
+        render(
+            <NavigationContainer>
+                <TextFilterPopup
+                    baseFilterKey={baseFilterKey}
+                    values={{[baseFilterKey]: 'Office'}}
+                    label="common.description"
+                    closeOverlay={closeOverlay}
+                    updateFilterForm={updateFilterForm}
+                />
+            </NavigationContainer>,
+        );
 
         expect(screen.queryByText('search.filters.merchant.matchType')).not.toBeOnTheScreen();
-        expect(screen.queryByText('search.filters.merchant.contains')).not.toBeOnTheScreen();
-        expect(screen.queryByText('search.filters.merchant.exactMatch')).not.toBeOnTheScreen();
-
+        fireEvent.changeText(screen.getByLabelText('common.description'), 'Supplies');
+        expect(screen.queryByText('search.filters.filterType.is.negative')).not.toBeOnTheScreen();
         fireEvent.press(screen.getByText('common.apply'));
 
         expect(updateFilterForm).toHaveBeenCalledWith({
-            [FILTER_KEYS.MERCHANT]: undefined,
-            [FILTER_KEYS.MERCHANT_NOT]: 'I',
-            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+            [baseFilterKey]: 'Supplies',
+            [`${baseFilterKey}Not`]: undefined,
         });
+        expect(closeOverlay).toHaveBeenCalledTimes(1);
     });
 });

From 631a35d41d6f0ff12654dfd414083bbce1d64384 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Tue, 8 Sep 2026 03:26:25 +0700
Subject: [PATCH 25/38] refactor(search): remove redundant text filter wrapper

---
 .../TextInputFilterContent.tsx                | 37 +++++++++----------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
index 1cf9f64a4c7e..bf92c39e5811 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
@@ -38,29 +38,11 @@ function TextInputFilterContent({baseFilterKey, value: initialValue, isNegated:
     const styles = useThemeStyles();
     const [value, setValue] = useState(initialValue);
     const [isNegated, setIsNegated] = useState(initialIsNegated);
+
     const label = translate(FILTER_VIEW_MAP[baseFilterKey].labelKey);
     const {inputCallbackRef} = useAutoFocusInput();
     const error = useTextFilterValidation(baseFilterKey, value);
 
-    const filterInput = (
-        <TextInput
-            ref={(ref) => {
-                if (!autoFocus || !isTextInput(ref)) {
-                    return;
-                }
-                inputCallbackRef(ref);
-            }}
-            placeholder={label}
-            value={value}
-            errorText={error}
-            hasError={!!error}
-            onChangeText={setValue}
-            accessibilityLabel={label}
-            role={CONST.ROLE.PRESENTATION}
-            containerStyles={[styles.ph5]}
-        />
-    );
-
     return (
         <View style={[styles.flex1, styles.justifyContentBetween, style]}>
             <NegatableFilter
@@ -68,7 +50,22 @@ function TextInputFilterContent({baseFilterKey, value: initialValue, isNegated:
                 isNegated={isNegated}
                 onNegationChange={setIsNegated}
             >
-                <View>{filterInput}</View>
+                <TextInput
+                    ref={(ref) => {
+                        if (!autoFocus || !isTextInput(ref)) {
+                            return;
+                        }
+                        inputCallbackRef(ref);
+                    }}
+                    placeholder={label}
+                    value={value}
+                    errorText={error}
+                    hasError={!!error}
+                    onChangeText={setValue}
+                    accessibilityLabel={label}
+                    role={CONST.ROLE.PRESENTATION}
+                    containerStyles={[styles.ph5]}
+                />
             </NegatableFilter>
             <Button
                 style={[styles.ph5, styles.pb5]}

From 23b9ecc551ab609fc1fd3734690f11d07cffcbe9 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Tue, 8 Sep 2026 11:15:14 +0700
Subject: [PATCH 26/38] fix(search): preserve mixed merchant predicates in
 filter updates

---
 .../Search/hooks/useUpdateFilterQuery.tsx     |  8 +-
 src/libs/SearchQueryUtils.ts                  | 18 ++++-
 src/pages/Search/SearchColumnsPage.tsx        |  1 +
 tests/ui/SearchColumnsPageTest.tsx            | 53 +++++++++++++
 tests/unit/Search/SearchQueryUtilsTest.ts     | 79 +++++++++++++++++++
 tests/unit/hooks/useUpdateFilterQuery.test.ts | 77 ++++++++++++++++++
 6 files changed, 228 insertions(+), 8 deletions(-)
 create mode 100644 tests/ui/SearchColumnsPageTest.tsx
 create mode 100644 tests/unit/hooks/useUpdateFilterQuery.test.ts

diff --git a/src/components/Search/hooks/useUpdateFilterQuery.tsx b/src/components/Search/hooks/useUpdateFilterQuery.tsx
index 1a1e171dc90d..97a8b54ceae5 100644
--- a/src/components/Search/hooks/useUpdateFilterQuery.tsx
+++ b/src/components/Search/hooks/useUpdateFilterQuery.tsx
@@ -38,13 +38,7 @@ function useUpdateFilterQuery(queryJSON: SearchQueryJSON | undefined) {
     }
 
     function setFilterQueryParams(values: Partial<SearchAdvancedFiltersForm>) {
-        const queryString =
-            buildFilterQueryWithSortDefaults(
-                values,
-                {view: searchAdvancedFiltersForm.view, groupBy: searchAdvancedFiltersForm.groupBy},
-                {sortBy: queryJSON?.sortBy, sortOrder: queryJSON?.sortOrder},
-                policies,
-            ) ?? '';
+        const queryString = buildFilterQueryWithSortDefaults(values, {view: searchAdvancedFiltersForm.view, groupBy: searchAdvancedFiltersForm.groupBy}, queryJSON ?? {}, policies) ?? '';
         if (!queryString) {
             return;
         }
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index 260887576c45..5e9a7a8a6f00 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -902,6 +902,8 @@ type BuildQueryStringOptions = {
     sortBy?: string;
     sortOrder?: string;
     limit?: number;
+    /** Original query filters, including predicates that cannot fit in a single form field. */
+    flatFilters?: QueryFilters;
 };
 
 /**
@@ -940,6 +942,15 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
 
     // We separate type and status filters from other filters to maintain hashes consistency for saved searches
     const {type, groupBy, view, columns, limit, [FILTER_KEYS.MERCHANT_OPERATOR]: merchantOperator, ...otherFilters} = supportedFilterValues;
+    const merchantFilters =
+        options?.flatFilters?.filter((filter) => filter.key === FILTER_KEYS.MERCHANT && !filter.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO)) ?? [];
+    const lastMerchantFilter = merchantFilters.at(-1);
+    // The form displays the last positive Merchant clause. Preserve all original clauses until that field changes.
+    const shouldPreserveMerchantFilters =
+        merchantFilters.length > 1 &&
+        supportedFilterValues.merchant === lastMerchantFilter?.filters.map((item) => item.value.toString()).join(',') &&
+        getMerchantOperator(merchantOperator) ===
+            (lastMerchantFilter?.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO) ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO : DEFAULT_MERCHANT_OPERATOR);
     const filtersString: string[] = [];
 
     if (options?.sortBy) {
@@ -1000,6 +1011,10 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
                 if (keyInCorrectForm) {
                     let operator: ValueOf<typeof operatorToCharMap> | typeof EXPLICIT_EQUAL_TO_OPERATOR = operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO];
                     if (filterKey === FILTER_KEYS.MERCHANT && !isNegated) {
+                        if (shouldPreserveMerchantFilters) {
+                            return merchantFilters.map((filter) => buildFilterValuesString(FILTER_KEYS.MERCHANT, filter.filters).trim()).join(' ');
+                        }
+
                         operator =
                             getMerchantOperator(merchantOperator) === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO
                                 ? EXPLICIT_EQUAL_TO_OPERATOR
@@ -2462,7 +2477,7 @@ function shouldResetSortForViewChange({newView, oldView, groupBy}: {newView: str
 function buildFilterQueryWithSortDefaults(
     filterValues: Partial<SearchAdvancedFiltersForm>,
     previousState: {view?: string; groupBy?: string},
-    currentQueryOptions: {sortBy?: string; sortOrder?: string},
+    currentQueryOptions: BuildQueryStringOptions,
     policies?: OnyxCollection<OnyxTypes.Policy>,
 ): string | undefined {
     const resetSort = shouldResetSort({
@@ -2481,6 +2496,7 @@ function buildFilterQueryWithSortDefaults(
     const queryString = buildQueryStringFromFilterFormValues(filterValues, {
         sortBy: resetSort || resetSortForViewChange ? undefined : currentQueryOptions.sortBy,
         sortOrder: resetSort || resetSortForViewChange ? undefined : currentQueryOptions.sortOrder,
+        flatFilters: currentQueryOptions.flatFilters,
     });
 
     if (!resetSort && !resetSortForViewChange) {
diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index d3f35d34a0e1..ffedaab389ea 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -63,6 +63,7 @@ function SearchColumnsPage() {
         const queryString = buildQueryStringFromFilterFormValues(updatedAdvancedFilters, {
             sortBy: currentQueryJSON?.sortBy,
             sortOrder: currentQueryJSON?.sortOrder,
+            flatFilters: currentQueryJSON?.flatFilters,
         });
 
         Navigation.navigate(ROUTES.SEARCH_ROOT.getRoute({query: queryString}), {forceReplace: true});
diff --git a/tests/ui/SearchColumnsPageTest.tsx b/tests/ui/SearchColumnsPageTest.tsx
new file mode 100644
index 000000000000..8805c241d71c
--- /dev/null
+++ b/tests/ui/SearchColumnsPageTest.tsx
@@ -0,0 +1,53 @@
+import {fireEvent, render, screen} from '@testing-library/react-native';
+
+import type ColumnsSettingsList from '@components/ColumnsSettingsList';
+import MockText from '@components/Text';
+
+import useOnyx from '@hooks/useOnyx';
+
+import Navigation from '@libs/Navigation/Navigation';
+import {buildFilterFormValuesFromQuery, buildSearchQueryJSON} from '@libs/SearchQueryUtils';
+
+import NAVIGATORS from '@src/NAVIGATORS';
+import SearchColumnsPage from '@src/pages/Search/SearchColumnsPage';
+import SCREENS from '@src/SCREENS';
+
+import type {ComponentProps} from 'react';
+
+const mockGetRootState = jest.fn();
+
+jest.mock('@hooks/useOnyx', () => jest.fn());
+jest.mock('@libs/Navigation/Navigation', () => ({__esModule: true, default: {navigate: jest.fn()}}));
+jest.mock('@libs/Navigation/navigationRef', () => ({__esModule: true, default: {getRootState: () => mockGetRootState() as unknown}}));
+jest.mock('@components/ColumnsSettingsList', () => ({onSave}: Pick<ComponentProps<typeof ColumnsSettingsList>, 'onSave'>) => (
+    <MockText onPress={() => onSave(['merchant', 'amount'])}>Save columns</MockText>
+));
+
+describe('SearchColumnsPage', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('keeps mixed Merchant predicates when saving different columns', () => {
+        const input = 'merchant=I merchant*:I';
+        const queryJSON = buildSearchQueryJSON(input);
+        if (!queryJSON) {
+            throw new Error('Invalid test query');
+        }
+
+        const form = buildFilterFormValuesFromQuery(queryJSON, {}, {}, {}, {}, {}, {}, {});
+        (jest.mocked(useOnyx) as jest.Mock).mockReturnValue([form]);
+        mockGetRootState.mockReturnValue({
+            routes: [{name: NAVIGATORS.TAB_NAVIGATOR, params: {screen: NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, params: {screen: SCREENS.SEARCH.ROOT, params: {q: input}}}}],
+        });
+
+        render(<SearchColumnsPage />);
+        fireEvent.press(screen.getByText('Save columns'));
+
+        const [route] = jest.mocked(Navigation.navigate).mock.calls.at(-1) ?? [];
+        const updatedQuery = buildSearchQueryJSON(new URL(route ?? '', 'https://example.com').searchParams.get('q') ?? '');
+
+        expect(updatedQuery?.flatFilters).toEqual(queryJSON.flatFilters);
+        expect(updatedQuery?.columns).toEqual(['merchant', 'amount']);
+    });
+});
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index 362308c7ec96..795065ebd8a7 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -2595,6 +2595,85 @@ describe('SearchQueryUtils', () => {
     });
 
     describe('buildFilterQueryWithSortDefaults', () => {
+        describe('Merchant predicates', () => {
+            function updateQuery(input: string, updates: Partial<SearchAdvancedFiltersForm>) {
+                const originalQuery = buildSearchQueryJSON(input);
+                if (!originalQuery) {
+                    throw new Error('Invalid test query');
+                }
+
+                const form = buildFilterFormValuesFromQuery(originalQuery, {}, {}, {}, {}, {}, {}, {});
+                const result = buildFilterQueryWithSortDefaults({...form, ...updates}, originalQuery, originalQuery);
+                const updatedQuery = buildSearchQueryJSON(result ?? '');
+                if (!updatedQuery) {
+                    throw new Error('Invalid updated query');
+                }
+
+                return {originalQuery, updatedQuery};
+            }
+
+            test.each([
+                'merchant="Coffee Shop" merchant*:Coffee',
+                'merchant*:Coffee merchant="Coffee Shop"',
+                'merchant*:Tea merchant="Coffee Shop"',
+                'merchant="Coffee Shop" merchant:Coffee',
+                'merchant="Coffee Shop",Uber merchant*:Coffee,Tea',
+                'merchant="Coffee, Shop" merchant*:"Coffee, Shop"',
+                'merchant=I merchant*:I merchant*:g',
+                'merchant=I merchant*:I -merchant:Ig',
+                'merchant*:Coffee merchant*:Shop',
+                'merchant=I',
+                'merchant*:I',
+                '-merchant:I',
+            ])('preserves Merchant predicates when changing Currency: %s', (input) => {
+                const {originalQuery, updatedQuery} = updateQuery(input, {currency: ['USD']});
+
+                expect(updatedQuery.flatFilters.filter((filter) => filter.key === 'merchant')).toEqual(originalQuery.flatFilters.filter((filter) => filter.key === 'merchant'));
+                expect(updatedQuery.flatFilters).toContainEqual({key: 'currency', filters: [{operator: 'eq', value: 'USD'}]});
+            });
+
+            test.each<Partial<SearchAdvancedFiltersForm>>([{description: 'Lunch'}, {dateAfter: '2026-01-01'}, {groupBy: CONST.SEARCH.GROUP_BY.MONTH, view: CONST.SEARCH.VIEW.BAR}])(
+                'preserves Merchant predicates when changing other filters: %j',
+                (updates) => {
+                    const {originalQuery, updatedQuery} = updateQuery('merchant=I merchant*:I', updates);
+
+                    expect(updatedQuery.flatFilters.filter((filter) => filter.key === 'merchant')).toEqual(originalQuery.flatFilters);
+                },
+            );
+
+            test('preserves Merchant predicates through consecutive form updates', () => {
+                const firstUpdate = updateQuery('merchant=I merchant*:I', {description: 'Lunch'});
+                const secondUpdate = updateQuery(buildSearchQueryString(firstUpdate.updatedQuery), {currency: ['USD']});
+
+                expect(secondUpdate.updatedQuery.flatFilters.filter((filter) => filter.key === 'merchant')).toEqual(firstUpdate.originalQuery.flatFilters);
+                expect(secondUpdate.updatedQuery.flatFilters).toContainEqual({key: 'description', filters: [{operator: 'eq', value: 'Lunch'}]});
+            });
+
+            test.each<{updates: Partial<SearchAdvancedFiltersForm>; expected: string}>([
+                {updates: {merchant: 'Tea'}, expected: 'merchant*:Tea'},
+                {updates: {merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO}, expected: 'merchant=I'},
+                {updates: {merchant: undefined}, expected: ''},
+                {updates: {merchant: undefined, merchantNot: 'I'}, expected: '-merchant:I'},
+                {updates: {type: CONST.SEARCH.DATA_TYPES.CHAT}, expected: ''},
+            ])('replaces or removes Merchant predicates on an explicit change: %j', ({updates, expected}) => {
+                const {updatedQuery} = updateQuery('merchant=I merchant*:I', updates);
+
+                expect(updatedQuery.flatFilters.filter((filter) => filter.key === 'merchant')).toEqual(buildSearchQueryJSON(expected)?.flatFilters);
+            });
+
+            test('clears all Merchant predicates when resetting advanced filters', () => {
+                const queryJSON = buildSearchQueryJSON('merchant=I merchant*:I');
+                if (!queryJSON) {
+                    throw new Error('Invalid test query');
+                }
+
+                const form = buildFilterFormValuesFromQuery(queryJSON, {}, {}, {}, {}, {}, {}, {});
+                const {updatedQuery} = updateQuery('merchant=I merchant*:I', getAdvancedFiltersToReset(form));
+
+                expect(updatedQuery.flatFilters).toEqual([]);
+            });
+        });
+
         test('groupBy change replaces stale sortBy with new default', () => {
             const result = buildFilterQueryWithSortDefaults(
                 {type: 'expense', groupBy: CONST.SEARCH.GROUP_BY.MONTH, view: CONST.SEARCH.VIEW.BAR},
diff --git a/tests/unit/hooks/useUpdateFilterQuery.test.ts b/tests/unit/hooks/useUpdateFilterQuery.test.ts
new file mode 100644
index 000000000000..897292002e81
--- /dev/null
+++ b/tests/unit/hooks/useUpdateFilterQuery.test.ts
@@ -0,0 +1,77 @@
+import {act, renderHook} from '@testing-library/react-native';
+
+import useUpdateFilterQuery from '@components/Search/hooks/useUpdateFilterQuery';
+
+import useOnyx from '@hooks/useOnyx';
+
+import Navigation from '@libs/Navigation/Navigation';
+import {buildFilterFormValuesFromQuery, buildSearchQueryJSON, getAdvancedFiltersToReset} from '@libs/SearchQueryUtils';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {SearchAdvancedFiltersForm} from '@src/types/form';
+
+jest.mock('@hooks/useOnyx', () => jest.fn());
+jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
+jest.mock('@libs/Navigation/Navigation', () => ({
+    __esModule: true,
+    default: {setParams: jest.fn()},
+}));
+
+describe('useUpdateFilterQuery', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    function setup() {
+        const queryJSON = buildSearchQueryJSON('merchant=I merchant*:I');
+        if (!queryJSON) {
+            throw new Error('Invalid test query');
+        }
+
+        const form = buildFilterFormValuesFromQuery(queryJSON, {}, {}, {}, {}, {}, {}, {});
+        (jest.mocked(useOnyx) as jest.Mock).mockImplementation((key: string) => [key === ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM ? form : {}]);
+
+        return {...renderHook(() => useUpdateFilterQuery(queryJSON)), form, queryJSON};
+    }
+
+    function getNavigatedQuery() {
+        const [params] = jest.mocked(Navigation.setParams).mock.calls.at(-1) ?? [];
+        if (!params || !('q' in params) || typeof params.q !== 'string') {
+            throw new Error('Expected navigation to a search query');
+        }
+
+        return buildSearchQueryJSON(params.q);
+    }
+
+    test.each(['updateFilterQueryParams', 'setFilterQueryParams'] as const)('retains mixed Merchant predicates through %s', (method) => {
+        const {result, form, queryJSON} = setup();
+        const updates: Partial<SearchAdvancedFiltersForm> = {currency: ['VND']};
+
+        act(() => {
+            result.current[method](method === 'setFilterQueryParams' ? {...form, ...updates} : updates);
+        });
+
+        expect(getNavigatedQuery()?.flatFilters.filter((filter) => filter.key === 'merchant')).toEqual(queryJSON.flatFilters);
+        expect(getNavigatedQuery()?.flatFilters).toContainEqual({key: 'currency', filters: [{operator: 'eq', value: 'VND'}]});
+    });
+
+    test('removes all positive Merchant predicates when clearing the Merchant chip', () => {
+        const {result} = setup();
+
+        act(() => {
+            result.current.updateFilterQueryParams({merchant: undefined});
+        });
+
+        expect(getNavigatedQuery()?.flatFilters).toEqual([]);
+    });
+
+    test('removes all Merchant predicates when resetting advanced filters', () => {
+        const {result, form} = setup();
+
+        act(() => {
+            result.current.setFilterQueryParams(getAdvancedFiltersToReset(form));
+        });
+
+        expect(getNavigatedQuery()?.flatFilters).toEqual([]);
+    });
+});

From 4b7c2342d9e0556d9eeac6fb7dbea908342ed2f5 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Tue, 8 Sep 2026 12:25:07 +0700
Subject: [PATCH 27/38] fix(search): preserve merchant lists through filter
 updates

---
 src/libs/SearchQueryUtils.ts              |  2 +-
 tests/unit/Search/SearchQueryUtilsTest.ts | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index 5e9a7a8a6f00..f3ed8985bf77 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -947,7 +947,7 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
     const lastMerchantFilter = merchantFilters.at(-1);
     // The form displays the last positive Merchant clause. Preserve all original clauses until that field changes.
     const shouldPreserveMerchantFilters =
-        merchantFilters.length > 1 &&
+        merchantFilters.length > 0 &&
         supportedFilterValues.merchant === lastMerchantFilter?.filters.map((item) => item.value.toString()).join(',') &&
         getMerchantOperator(merchantOperator) ===
             (lastMerchantFilter?.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO) ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO : DEFAULT_MERCHANT_OPERATOR);
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index 795065ebd8a7..2feca9114bcf 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -2622,6 +2622,12 @@ describe('SearchQueryUtils', () => {
                 'merchant=I merchant*:I merchant*:g',
                 'merchant=I merchant*:I -merchant:Ig',
                 'merchant*:Coffee merchant*:Shop',
+                'merchant*:Amazon,Uber',
+                'merchant:Amazon,Uber',
+                'merchant=Amazon,Uber',
+                'merchant*:"Amazon,Uber"',
+                'merchant="Amazon,Uber"',
+                'merchant*:"Coffee, Shop",Uber',
                 'merchant=I',
                 'merchant*:I',
                 '-merchant:I',
@@ -2649,6 +2655,15 @@ describe('SearchQueryUtils', () => {
                 expect(secondUpdate.updatedQuery.flatFilters).toContainEqual({key: 'description', filters: [{operator: 'eq', value: 'Lunch'}]});
             });
 
+            test.each<{updates: Partial<SearchAdvancedFiltersForm>; expected: string}>([
+                {updates: {merchant: 'Tea'}, expected: 'merchant*:Tea'},
+                {updates: {merchant: undefined}, expected: ''},
+            ])('replaces or removes a Merchant list on an explicit change: %j', ({updates, expected}) => {
+                const {updatedQuery} = updateQuery('merchant*:Amazon,Uber', updates);
+
+                expect(updatedQuery.flatFilters.filter((filter) => filter.key === 'merchant')).toEqual(buildSearchQueryJSON(expected)?.flatFilters);
+            });
+
             test.each<{updates: Partial<SearchAdvancedFiltersForm>; expected: string}>([
                 {updates: {merchant: 'Tea'}, expected: 'merchant*:Tea'},
                 {updates: {merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO}, expected: 'merchant=I'},

From 7b33baff27d302110625b06bc05b92a44fb476d1 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Tue, 8 Sep 2026 13:10:02 +0700
Subject: [PATCH 28/38] fix(search): retain merchant lists when changing match
 type

---
 src/libs/SearchQueryUtils.ts              | 10 ++++++-
 tests/unit/Search/SearchQueryUtilsTest.ts | 33 +++++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index f3ed8985bf77..9beff22322ac 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -945,10 +945,11 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
     const merchantFilters =
         options?.flatFilters?.filter((filter) => filter.key === FILTER_KEYS.MERCHANT && !filter.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO)) ?? [];
     const lastMerchantFilter = merchantFilters.at(-1);
+    const isMerchantValueUnchanged = supportedFilterValues.merchant === lastMerchantFilter?.filters.map((item) => item.value.toString()).join(',');
     // The form displays the last positive Merchant clause. Preserve all original clauses until that field changes.
     const shouldPreserveMerchantFilters =
         merchantFilters.length > 0 &&
-        supportedFilterValues.merchant === lastMerchantFilter?.filters.map((item) => item.value.toString()).join(',') &&
+        isMerchantValueUnchanged &&
         getMerchantOperator(merchantOperator) ===
             (lastMerchantFilter?.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO) ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO : DEFAULT_MERCHANT_OPERATOR);
     const filtersString: string[] = [];
@@ -1015,6 +1016,13 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
                             return merchantFilters.map((filter) => buildFilterValuesString(FILTER_KEYS.MERCHANT, filter.filters).trim()).join(' ');
                         }
 
+                        if (lastMerchantFilter && isMerchantValueUnchanged) {
+                            // The form string cannot distinguish a list from a Merchant name containing a comma.
+                            const updatedOperator = getMerchantOperator(merchantOperator);
+                            const updatedFilters = lastMerchantFilter.filters.map((filter) => ({...filter, operator: updatedOperator}));
+                            return buildFilterValuesString(FILTER_KEYS.MERCHANT, updatedFilters).trim();
+                        }
+
                         operator =
                             getMerchantOperator(merchantOperator) === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO
                                 ? EXPLICIT_EQUAL_TO_OPERATOR
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index 2feca9114bcf..d8e7cc079d13 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -50,6 +50,7 @@ import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
 import SCREENS from '@src/SCREENS';
 import type {SearchAdvancedFiltersForm} from '@src/types/form';
+import type {MerchantMatchType} from '@src/types/form/SearchAdvancedFiltersForm';
 import type * as OnyxTypes from '@src/types/onyx';
 import type {Connections} from '@src/types/onyx/Policy';
 
@@ -2655,8 +2656,40 @@ describe('SearchQueryUtils', () => {
                 expect(secondUpdate.updatedQuery.flatFilters).toContainEqual({key: 'description', filters: [{operator: 'eq', value: 'Lunch'}]});
             });
 
+            test.each<{input: string; operator: MerchantMatchType; expectedValue: string | string[]}>([
+                {input: 'merchant*:I,Ig', operator: 'eq', expectedValue: ['I', 'Ig']},
+                {input: 'merchant=I,Ig', operator: 'contains', expectedValue: ['I', 'Ig']},
+                {input: 'merchant:I,Ig', operator: 'eq', expectedValue: ['I', 'Ig']},
+                {input: 'merchant*:"I,Ig"', operator: 'eq', expectedValue: 'I,Ig'},
+                {input: 'merchant="I,Ig"', operator: 'contains', expectedValue: 'I,Ig'},
+                {input: 'merchant*:"Coffee, Shop",Uber', operator: 'eq', expectedValue: ['Coffee, Shop', 'Uber']},
+                {input: 'merchant="Coffee, Shop",Uber', operator: 'contains', expectedValue: ['Coffee, Shop', 'Uber']},
+                {input: 'merchant=I merchant*:I,Ig', operator: 'eq', expectedValue: ['I', 'Ig']},
+                {input: 'merchant*:I merchant=I,Ig', operator: 'contains', expectedValue: ['I', 'Ig']},
+            ])('preserves Merchant values when changing only the match type: %j', ({input, operator, expectedValue}) => {
+                const {updatedQuery} = updateQuery(input, {merchantOperator: operator});
+
+                expect(updatedQuery.filters).toEqual({operator, left: 'merchant', right: expectedValue});
+            });
+
+            test('keeps a Merchant list through successive match type and Currency changes without mutating the original query', () => {
+                const {originalQuery, updatedQuery} = updateQuery('merchant*:I,Ig', {merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO});
+                const currencyUpdate = updateQuery(buildSearchQueryString(updatedQuery), {currency: ['USD']});
+
+                expect(originalQuery.filters).toEqual({operator: 'contains', left: 'merchant', right: ['I', 'Ig']});
+                expect(currencyUpdate.updatedQuery.flatFilters).toContainEqual({
+                    key: 'merchant',
+                    filters: [
+                        {operator: 'eq', value: 'I'},
+                        {operator: 'eq', value: 'Ig'},
+                    ],
+                });
+                expect(currencyUpdate.updatedQuery.flatFilters).toContainEqual({key: 'currency', filters: [{operator: 'eq', value: 'USD'}]});
+            });
+
             test.each<{updates: Partial<SearchAdvancedFiltersForm>; expected: string}>([
                 {updates: {merchant: 'Tea'}, expected: 'merchant*:Tea'},
+                {updates: {merchant: 'I,Ig', merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO}, expected: 'merchant="I,Ig"'},
                 {updates: {merchant: undefined}, expected: ''},
             ])('replaces or removes a Merchant list on an explicit change: %j', ({updates, expected}) => {
                 const {updatedQuery} = updateQuery('merchant*:Amazon,Uber', updates);

From 0154b5e3aff742aa21926fad7a4de141cfc25f2c Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Fri, 25 Sep 2026 14:57:58 +0700
Subject: [PATCH 29/38] fix(search): apply merchant conditions to all clauses

---
 src/languages/de.ts                       |   2 +-
 src/languages/el.ts                       |   2 +-
 src/languages/en.ts                       |   2 +-
 src/languages/es.ts                       |   2 +-
 src/languages/fr.ts                       |   2 +-
 src/languages/it.ts                       |   2 +-
 src/languages/ja.ts                       |   2 +-
 src/languages/nl.ts                       |   2 +-
 src/languages/pl.ts                       |   2 +-
 src/languages/pt-BR.ts                    |   2 +-
 src/languages/zh-hans.ts                  |   2 +-
 src/libs/SearchQueryUtils.ts              |  53 +++++-----
 tests/ui/MerchantFilterContentTest.tsx    |  26 +++++
 tests/ui/MerchantFilterPopupTest.tsx      |  15 +++
 tests/unit/Search/SearchQueryUtilsTest.ts | 116 +++++++++++++++++++++-
 15 files changed, 196 insertions(+), 36 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index 33466b29dbdb..709429244656 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -9564,7 +9564,7 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Export',
             },
             filterType: {label: 'Filtertyp', has: {positive: 'hat', negative: 'hat nicht'}, is: {positive: 'ist', negative: 'ist nicht'}},
-            merchant: {matchType: 'Übereinstimmungstyp', contains: 'Enthält', exactMatch: 'Exakte Übereinstimmungen'},
+            merchant: {matchType: 'Übereinstimmungstyp', contains: 'Enthält', exactMatch: 'Gleich'},
         },
         display: {
             label: 'Anzeige',
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 96f033f9b1fa..5959c97214c7 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -9773,7 +9773,7 @@ ${reportName}`,
                 has: {positive: 'έχει', negative: 'δεν έχει'},
                 is: {positive: 'είναι', negative: 'δεν είναι'},
             },
-            merchant: {matchType: 'Τύπος αντιστοίχισης', contains: 'Περιέχει', exactMatch: 'Ακριβής αντιστοιχία'},
+            merchant: {matchType: 'Τύπος αντιστοίχισης', contains: 'Περιέχει', exactMatch: 'Ίσο με'},
         },
         display: {
             label: 'Εμφάνιση',
diff --git a/src/languages/en.ts b/src/languages/en.ts
index fcb9441fbefa..771185896734 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -9651,7 +9651,7 @@ const translations = {
             merchant: {
                 matchType: 'Match type',
                 contains: 'Contains',
-                exactMatch: 'Exactly matches',
+                exactMatch: 'Equal to',
             },
             card: {
                 expensify: 'Expensify',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 4b1a8386c2b4..b385a5599e7d 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -9432,7 +9432,7 @@ ${reportName}`,
             },
             reportField: (name, value) => `${name} es ${value}`,
             filterType: {label: 'Tipo de filtro', has: {positive: 'tiene', negative: 'no tiene'}, is: {positive: 'es', negative: 'no es'}},
-            merchant: {matchType: 'Tipo de coincidencia', contains: 'Contiene', exactMatch: 'Coincide exactamente'},
+            merchant: {matchType: 'Tipo de coincidencia', contains: 'Contiene', exactMatch: 'Igual a'},
         },
         chartTitles: {
             [CONST.SEARCH.GROUP_BY.FROM]: 'De',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 42b4b87e7f1a..9058e8d18fd3 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -9585,7 +9585,7 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exporter',
             },
             filterType: {label: 'Type de filtre', has: {positive: 'a', negative: 'n’a pas'}, is: {positive: 'est', negative: 'n’est pas'}},
-            merchant: {matchType: 'Type de correspondance', contains: 'Contient', exactMatch: 'Correspond exactement'},
+            merchant: {matchType: 'Type de correspondance', contains: 'Contient', exactMatch: 'Égal à'},
         },
         display: {
             label: 'Affichage',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 3ac7079b3f30..d6fb36e55a89 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -9523,7 +9523,7 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Esporta',
             },
             filterType: {label: 'Tipo di filtro', has: {positive: 'ha', negative: 'non ha'}, is: {positive: 'è', negative: 'non è'}},
-            merchant: {matchType: 'Tipo di corrispondenza', contains: 'Contiene', exactMatch: 'Corrisponde esattamente'},
+            merchant: {matchType: 'Tipo di corrispondenza', contains: 'Contiene', exactMatch: 'Uguale a'},
         },
         display: {
             label: 'Visualizza',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 5d93409e4d53..f634d6a2893d 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -9401,7 +9401,7 @@ ${reportName}`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'エクスポート',
             },
             filterType: {label: 'フィルタータイプ', has: {positive: '持っています', negative: '持っていません'}, is: {positive: 'は', negative: 'ではありません'}},
-            merchant: {matchType: 'マッチタイプ', contains: '含む', exactMatch: '完全一致'},
+            merchant: {matchType: 'マッチタイプ', contains: '含む', exactMatch: '等しい'},
         },
         display: {
             label: '表示',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index b733f0e36e2f..e9bf9bec0627 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -9490,7 +9490,7 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exporteren',
             },
             filterType: {label: 'Filtertype', has: {positive: 'heeft', negative: 'heeft niet'}, is: {positive: 'is', negative: 'is niet'}},
-            merchant: {matchType: 'Overeenkomsttype', contains: 'Bevat', exactMatch: 'Komt exact overeen'},
+            merchant: {matchType: 'Overeenkomsttype', contains: 'Bevat', exactMatch: 'Gelijk aan'},
         },
         display: {
             label: 'Weergave',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 3141649aa4fc..3d138ddc3040 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -9514,7 +9514,7 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Eksportuj',
             },
             filterType: {label: 'Typ filtra', has: {positive: 'ma', negative: 'nie ma'}, is: {positive: 'jest', negative: 'nie jest'}},
-            merchant: {matchType: 'Typ dopasowania', contains: 'Zawiera', exactMatch: 'Dokładne dopasowanie'},
+            merchant: {matchType: 'Typ dopasowania', contains: 'Zawiera', exactMatch: 'Równe'},
         },
         display: {
             label: 'Wyświetl',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index ddc68dc45fc6..c149f7091ef1 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -9490,7 +9490,7 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exportar',
             },
             filterType: {label: 'Tipo de filtro', has: {positive: 'tem', negative: 'não tem'}, is: {positive: 'é', negative: 'não é'}},
-            merchant: {matchType: 'Tipo de correspondência', contains: 'Contém', exactMatch: 'Corresponde exatamente'},
+            merchant: {matchType: 'Tipo de correspondência', contains: 'Contém', exactMatch: 'Igual a'},
         },
         display: {
             label: 'Exibir',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index dd8d8557afc1..c652b829b07d 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -9154,7 +9154,7 @@ ${reportName}`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: '导出',
             },
             filterType: {label: '筛选类型', has: {positive: '有', negative: '没有'}, is: {positive: '是', negative: '不是'}},
-            merchant: {matchType: '匹配类型', contains: '包含', exactMatch: '完全匹配'},
+            merchant: {matchType: '匹配类型', contains: '包含', exactMatch: '等于'},
         },
         display: {
             label: '显示',
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index ba2c71e55ba0..be06d115d5da 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -983,16 +983,18 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
 
     // We separate type and status filters from other filters to maintain hashes consistency for saved searches
     const {type, groupBy, view, columns, limit, [FILTER_KEYS.MERCHANT_OPERATOR]: merchantOperator, ...otherFilters} = supportedFilterValues;
-    const merchantFilters =
-        options?.flatFilters?.filter((filter) => filter.key === FILTER_KEYS.MERCHANT && !filter.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO)) ?? [];
-    const lastMerchantFilter = merchantFilters.at(-1);
-    const isMerchantValueUnchanged = supportedFilterValues.merchant === lastMerchantFilter?.filters.map((item) => item.value.toString()).join(',');
-    // The form displays the last positive Merchant clause. Preserve all original clauses until that field changes.
-    const shouldPreserveMerchantFilters =
-        merchantFilters.length > 0 &&
-        isMerchantValueUnchanged &&
-        getMerchantOperator(merchantOperator) ===
-            (lastMerchantFilter?.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO) ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO : DEFAULT_MERCHANT_OPERATOR);
+    const merchantFilters = options?.flatFilters?.filter((filter) => filter.key === FILTER_KEYS.MERCHANT) ?? [];
+    const positiveMerchantFilters = merchantFilters.filter((filter) => !filter.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO));
+    const negativeMerchantFilters = merchantFilters.filter((filter) => filter.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO));
+    const wasMerchantNegated = negativeMerchantFilters.length > 0;
+    const isMerchantNegated = !!supportedFilterValues.merchantNot;
+    const hasMerchantNegationChanged = wasMerchantNegated !== isMerchantNegated;
+    const lastVisibleMerchantFilter = (wasMerchantNegated ? negativeMerchantFilters : positiveMerchantFilters).at(-1);
+    const selectedMerchantOperator = getMerchantOperator(merchantOperator);
+    const currentMerchantOperator = positiveMerchantFilters.at(-1)?.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO)
+        ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO
+        : DEFAULT_MERCHANT_OPERATOR;
+    const hasMerchantOperatorChanged = !isMerchantNegated && selectedMerchantOperator !== currentMerchantOperator;
     const filtersString: string[] = [];
 
     if (options?.sortBy) {
@@ -1052,22 +1054,27 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
                 const keyInCorrectForm = (Object.keys(CONST.SEARCH.SYNTAX_FILTER_KEYS) as FilterKeys[]).find((key) => CONST.SEARCH.SYNTAX_FILTER_KEYS[key] === filterKey);
                 if (keyInCorrectForm) {
                     let operator: ValueOf<typeof operatorToCharMap> | typeof EXPLICIT_EQUAL_TO_OPERATOR = operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO];
-                    if (filterKey === FILTER_KEYS.MERCHANT && !isNegated) {
-                        if (shouldPreserveMerchantFilters) {
-                            return merchantFilters.map((filter) => buildFilterValuesString(FILTER_KEYS.MERCHANT, filter.filters).trim()).join(' ');
-                        }
-
+                    if (filterKey === FILTER_KEYS.MERCHANT) {
+                        const originalMerchantFilters = isNegated ? negativeMerchantFilters : positiveMerchantFilters;
+                        const lastMerchantFilter = hasMerchantNegationChanged ? lastVisibleMerchantFilter : originalMerchantFilters.at(-1);
+                        const isMerchantValueUnchanged = filterValue === lastMerchantFilter?.filters.map((item) => item.value.toString()).join(',');
                         if (lastMerchantFilter && isMerchantValueUnchanged) {
-                            // The form string cannot distinguish a list from a Merchant name containing a comma.
-                            const updatedOperator = getMerchantOperator(merchantOperator);
-                            const updatedFilters = lastMerchantFilter.filters.map((filter) => ({...filter, operator: updatedOperator}));
-                            return buildFilterValuesString(FILTER_KEYS.MERCHANT, updatedFilters).trim();
+                            const hasMerchantConditionChanged = hasMerchantNegationChanged || hasMerchantOperatorChanged;
+                            const filtersToUpdate = hasMerchantConditionChanged ? merchantFilters : originalMerchantFilters;
+                            const updatedOperator = isNegated ? CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO : selectedMerchantOperator;
+                            // The single field cannot represent every clause or distinguish lists from names containing commas.
+                            const merchantClauses = filtersToUpdate.map((filter) => {
+                                const clauseFilters = hasMerchantConditionChanged ? filter.filters.map((item) => ({...item, operator: updatedOperator})) : filter.filters;
+                                return buildFilterValuesString(FILTER_KEYS.MERCHANT, clauseFilters).trim();
+                            });
+                            // Different operators can become identical clauses after the change.
+                            return [...new Set(merchantClauses)].join(' ');
                         }
 
-                        operator =
-                            getMerchantOperator(merchantOperator) === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO
-                                ? EXPLICIT_EQUAL_TO_OPERATOR
-                                : operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS];
+                        if (!isNegated) {
+                            operator =
+                                selectedMerchantOperator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO ? EXPLICIT_EQUAL_TO_OPERATOR : operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS];
+                        }
                     }
                     return `${prefix}${CONST.SEARCH.SYNTAX_FILTER_KEYS[keyInCorrectForm]}${operator}${sanitizeSearchValue(filterValue as string)}`;
                 }
diff --git a/tests/ui/MerchantFilterContentTest.tsx b/tests/ui/MerchantFilterContentTest.tsx
index fb56e7b1a4a9..7075546bdf11 100644
--- a/tests/ui/MerchantFilterContentTest.tsx
+++ b/tests/ui/MerchantFilterContentTest.tsx
@@ -89,6 +89,32 @@ describe('MerchantFilterContent', () => {
         });
     });
 
+    it('retains the value when changing a stored negative filter back to positive', () => {
+        const onChange = jest.fn();
+        render(
+            <NavigationContainer>
+                <MerchantFilterContent
+                    baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}
+                    value="Prime"
+                    isNegated
+                    merchantOperator={CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO}
+                    onChange={onChange}
+                />
+            </NavigationContainer>,
+        );
+
+        fireEvent.press(screen.getByText('search.filters.filterType.is.positive'));
+        expect(screen.getByDisplayValue('Prime')).toBeOnTheScreen();
+        fireEvent.press(screen.getByText('search.filters.merchant.contains'));
+        fireEvent.press(screen.getByText('common.confirm'));
+
+        expect(onChange).toHaveBeenCalledWith({
+            [FILTER_KEYS.MERCHANT]: 'Prime',
+            [FILTER_KEYS.MERCHANT_NOT]: undefined,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+        });
+    });
+
     it('hides match type controls and uses exact matching when the filter is negated', () => {
         const {onChange} = renderMerchantFilter();
         const merchantInput = screen.getByLabelText('common.merchant');
diff --git a/tests/ui/MerchantFilterPopupTest.tsx b/tests/ui/MerchantFilterPopupTest.tsx
index a69b136114c6..51fe742adab5 100644
--- a/tests/ui/MerchantFilterPopupTest.tsx
+++ b/tests/ui/MerchantFilterPopupTest.tsx
@@ -87,6 +87,21 @@ describe('MerchantFilterPopup', () => {
         });
     });
 
+    it('retains the value when changing a stored negative filter back to positive', () => {
+        const {updateFilterForm} = renderMerchantPopup(true, {merchant: undefined, merchantNot: 'Prime', merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO});
+
+        fireEvent.press(screen.getByText('search.filters.filterType.is.positive'));
+        expect(screen.getByDisplayValue('Prime')).toBeOnTheScreen();
+        fireEvent.press(screen.getByText('search.filters.merchant.contains'));
+        fireEvent.press(screen.getByText('common.apply'));
+
+        expect(updateFilterForm).toHaveBeenCalledWith({
+            [FILTER_KEYS.MERCHANT]: 'Prime',
+            [FILTER_KEYS.MERCHANT_NOT]: undefined,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+        });
+    });
+
     it('hides the match type and submits exact matching for a negated Merchant', () => {
         const {updateFilterForm} = renderMerchantPopup();
 
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index 8f89c8466fa6..65a25d484f4d 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -487,6 +487,32 @@ describe('SearchQueryUtils', () => {
             expect(result).toEqual('type:expense merchant*:Amazon');
         });
 
+        test('preserves multiple merchant clauses when the form value is unchanged', () => {
+            const queryJSON = buildSearchQueryJSON('type:expense merchant*:Amazon merchant*:Uber');
+            const filterValues: Partial<SearchAdvancedFiltersForm> = {
+                type: 'expense',
+                merchant: 'Uber',
+                merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+            };
+
+            const result = buildQueryStringFromFilterFormValues(filterValues, {flatFilters: queryJSON?.flatFilters});
+
+            expect(result).toEqual('type:expense merchant*:Amazon merchant*:Uber');
+        });
+
+        test('applies a changed merchant operator to every merchant clause', () => {
+            const queryJSON = buildSearchQueryJSON('type:expense merchant*:Amazon merchant*:Uber');
+            const filterValues: Partial<SearchAdvancedFiltersForm> = {
+                type: 'expense',
+                merchant: 'Uber',
+                merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+            };
+
+            const result = buildQueryStringFromFilterFormValues(filterValues, {flatFilters: queryJSON?.flatFilters});
+
+            expect(result).toEqual('type:expense merchant=Amazon merchant=Uber');
+        });
+
         test('currencies and categories', () => {
             const filterValues: Partial<SearchAdvancedFiltersForm> = {
                 type: 'expense',
@@ -2862,6 +2888,9 @@ describe('SearchQueryUtils', () => {
                 'merchant=I',
                 'merchant*:I',
                 '-merchant:I',
+                '-merchant:Amazon -merchant:Prime',
+                '-merchant:Amazon,Prime',
+                '-merchant:"Coffee, Shop",Uber',
             ])('preserves Merchant predicates when changing Currency: %s', (input) => {
                 const {originalQuery, updatedQuery} = updateQuery(input, {currency: ['USD']});
 
@@ -2894,14 +2923,97 @@ describe('SearchQueryUtils', () => {
                 {input: 'merchant="I,Ig"', operator: 'contains', expectedValue: 'I,Ig'},
                 {input: 'merchant*:"Coffee, Shop",Uber', operator: 'eq', expectedValue: ['Coffee, Shop', 'Uber']},
                 {input: 'merchant="Coffee, Shop",Uber', operator: 'contains', expectedValue: ['Coffee, Shop', 'Uber']},
-                {input: 'merchant=I merchant*:I,Ig', operator: 'eq', expectedValue: ['I', 'Ig']},
-                {input: 'merchant*:I merchant=I,Ig', operator: 'contains', expectedValue: ['I', 'Ig']},
             ])('preserves Merchant values when changing only the match type: %j', ({input, operator, expectedValue}) => {
                 const {updatedQuery} = updateQuery(input, {merchantOperator: operator});
 
                 expect(updatedQuery.filters).toEqual({operator, left: 'merchant', right: expectedValue});
             });
 
+            test.each<{input: string; operator: MerchantMatchType}>([
+                {input: 'merchant=I merchant*:I,Ig', operator: 'eq'},
+                {input: 'merchant*:I merchant=I,Ig', operator: 'contains'},
+            ])('applies a changed match type to every Merchant predicate: %j', ({input, operator}) => {
+                const {updatedQuery} = updateQuery(input, {merchantOperator: operator});
+
+                expect(updatedQuery.flatFilters.filter((filter) => filter.key === 'merchant')).toEqual([
+                    {key: 'merchant', filters: [{operator, value: 'I'}]},
+                    {
+                        key: 'merchant',
+                        filters: [
+                            {operator, value: 'I'},
+                            {operator, value: 'Ig'},
+                        ],
+                    },
+                ]);
+            });
+
+            test.each([
+                'merchant:Amazon merchant:Prime',
+                'merchant=Amazon merchant=Prime',
+                'merchant=Amazon merchant*:Prime',
+                'merchant:Amazon,Prime',
+                'merchant:"Coffee, Shop",Uber merchant:Prime',
+            ])('applies negation to every original Merchant value: %s', (input) => {
+                const originalQuery = buildSearchQueryJSON(input);
+                if (!originalQuery) {
+                    throw new Error('Invalid test query');
+                }
+                const form = buildFilterFormValuesFromQuery(originalQuery, {}, {}, {}, {}, {}, {}, {});
+                const {updatedQuery} = updateQuery(input, {
+                    merchant: undefined,
+                    merchantNot: form.merchantNot ?? form.merchant,
+                    merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+                });
+
+                expect(updatedQuery.flatFilters).toEqual(
+                    originalQuery?.flatFilters.map((filter) => ({
+                        ...filter,
+                        filters: filter.filters.map((item) => ({...item, operator: 'neq'})),
+                    })),
+                );
+            });
+
+            test.each(['-merchant:Amazon -merchant:Prime', '-merchant:Amazon,Prime', '-merchant:"Coffee, Shop",Uber -merchant:Prime', 'merchant:Amazon -merchant:Prime'])(
+                'applies positive matching to every original Merchant value: %s',
+                (input) => {
+                    const originalQuery = buildSearchQueryJSON(input);
+                    if (!originalQuery) {
+                        throw new Error('Invalid test query');
+                    }
+                    const form = buildFilterFormValuesFromQuery(originalQuery, {}, {}, {}, {}, {}, {}, {});
+                    const {updatedQuery} = updateQuery(input, {
+                        merchant: form.merchantNot,
+                        merchantNot: undefined,
+                        merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+                    });
+
+                    expect(updatedQuery.flatFilters).toEqual(
+                        originalQuery?.flatFilters.map((filter) => ({
+                            ...filter,
+                            filters: filter.filters.map((item) => ({...item, operator: 'eq'})),
+                        })),
+                    );
+                },
+            );
+
+            test.each(['merchant:Amazon merchant:Prime', '-merchant:Amazon -merchant:Prime', 'merchant=Amazon -merchant:Prime'])(
+                'removes every Merchant predicate without changing other filters: %s',
+                (input) => {
+                    const {updatedQuery} = updateQuery(`type:expense description:Lunch ${input}`, {merchant: undefined, merchantNot: undefined});
+
+                    expect(updatedQuery.type).toBe('expense');
+                    expect(updatedQuery.flatFilters).toEqual([{key: 'description', filters: [{operator: 'eq', value: 'Lunch'}]}]);
+                },
+            );
+
+            test('preserves both Merchant values through negation and match type round trips', () => {
+                const negative = updateQuery('merchant:Amazon merchant:Prime', {merchant: undefined, merchantNot: 'Prime', merchantOperator: 'eq'});
+                const positive = updateQuery(buildSearchQueryString(negative.updatedQuery), {merchant: 'Prime', merchantNot: undefined, merchantOperator: 'eq'});
+                const contains = updateQuery(buildSearchQueryString(positive.updatedQuery), {merchantOperator: 'contains'});
+
+                expect(contains.updatedQuery.filters).toEqual(negative.originalQuery.filters);
+            });
+
             test('keeps a Merchant list through successive match type and Currency changes without mutating the original query', () => {
                 const {originalQuery, updatedQuery} = updateQuery('merchant*:I,Ig', {merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO});
                 const currencyUpdate = updateQuery(buildSearchQueryString(updatedQuery), {currency: ['USD']});

From 31630f8b24f2ff911ae11514fe78baa6ff92f3a7 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Sat, 26 Sep 2026 21:20:14 +0700
Subject: [PATCH 30/38] fix(search): address merchant filter review feedback

- Localize the Merchant pill by passing the value into the contains/equalTo translations
- Rename the exactMatch translation key to equalTo
- Render MerchantFilterContent from the chip popup, keeping its Apply Sentry label and spacing
- Stop saving an unused operator for negated Merchant filters
- Align the Merchant advanced filter branch with the other branches and remount it when the operator changes
- Revert the no-op TextFilterPopup input extraction
- Define the Merchant query builder variables where they are used
- Merge and trim redundant Merchant tests
---
 .../AdvancedFilters/MerchantFilterContent.tsx |  13 +-
 .../SearchAdvancedFiltersContent.tsx          |   8 +-
 .../MerchantMatchTypeSelector.tsx             |   2 +-
 .../FilterDropdowns/MerchantFilterPopup.tsx   |  77 ++-----
 .../FilterDropdowns/TextFilterPopup.tsx       |  23 +-
 src/languages/de.ts                           |   6 +-
 src/languages/el.ts                           |   6 +-
 src/languages/en.ts                           |   4 +-
 src/languages/es.ts                           |   6 +-
 src/languages/fr.ts                           |   6 +-
 src/languages/it.ts                           |   6 +-
 src/languages/ja.ts                           |   6 +-
 src/languages/nl.ts                           |   6 +-
 src/languages/pl.ts                           |   6 +-
 src/languages/pt-BR.ts                        |   6 +-
 src/languages/zh-hans.ts                      |   6 +-
 src/libs/SearchQueryUtils.ts                  |  24 +--
 src/libs/SearchUIUtils.ts                     |   9 +-
 tests/ui/MerchantFilterContentTest.tsx        | 118 ++++-------
 tests/ui/MerchantFilterPopupTest.tsx          | 120 ++---------
 tests/ui/TextInputFilterContentTest.tsx       |  42 ----
 tests/unit/Search/SearchQueryUtilsTest.ts     | 200 +++++-------------
 tests/unit/Search/SearchUIUtilsTest.ts        |  51 ++---
 23 files changed, 260 insertions(+), 491 deletions(-)
 delete mode 100644 tests/ui/TextInputFilterContentTest.tsx

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent.tsx
index 5cbff1dc5540..3a646817e684 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent.tsx
@@ -43,12 +43,18 @@ type MerchantFilterContentProps = {
     /** The label used when the filter applies immediately. */
     buttonText?: string;
 
+    /** The Sentry label for the confirmation button. */
+    sentryLabel?: string;
+
     /** Whether the input should receive focus automatically. */
     autoFocus?: boolean;
 
     /** Additional styles for the filter content. */
     style?: StyleProp<ViewStyle>;
 
+    /** Additional styles for the confirmation button. */
+    buttonStyles?: StyleProp<ViewStyle>;
+
     /** Called with the updated Merchant filter form values. */
     onChange: (values: Partial<SearchAdvancedFiltersForm>) => void;
 };
@@ -64,8 +70,10 @@ function MerchantFilterContent({
     merchantOperator: initialMerchantOperator,
     buttonSize,
     buttonText,
+    sentryLabel,
     autoFocus,
     style,
+    buttonStyles,
     onChange,
 }: MerchantFilterContentProps) {
     const {translate} = useLocalize();
@@ -105,7 +113,7 @@ function MerchantFilterContent({
         onChange({
             [FILTER_KEYS.MERCHANT]: isNegated ? undefined : value,
             [FILTER_KEYS.MERCHANT_NOT]: isNegated ? value : undefined,
-            [FILTER_KEYS.MERCHANT_OPERATOR]: isNegated ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO : merchantOperator,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: isNegated ? undefined : merchantOperator,
         });
     };
 
@@ -128,10 +136,11 @@ function MerchantFilterContent({
                 </View>
             </NegatableFilter>
             <Button
-                style={[styles.ph5, styles.pb5]}
+                style={[styles.ph5, styles.pb5, buttonStyles]}
                 variant={CONST.BUTTON_VARIANT.SUCCESS}
                 size={buttonSize}
                 onPress={updateMerchantFilter}
+                sentryLabel={sentryLabel}
             >
                 <Button.KeyboardShortcut />
                 <Button.Text>{buttonText ?? translate('common.confirm')}</Button.Text>
diff --git a/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
index 3f8bea70a745..ff0bad60263a 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx
@@ -103,17 +103,15 @@ function SearchAdvancedFiltersContent({baseFilterKey, values, ready, components,
     }
 
     if (baseFilterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT) {
+        const {isNegated, value} = getFilterNegatableValue(baseFilterKey, values);
         const MerchantFilter = components.Merchant;
-        const isNegated = !!values?.[FILTER_KEYS.MERCHANT_NOT];
-        const value = values?.[isNegated ? FILTER_KEYS.MERCHANT_NOT : FILTER_KEYS.MERCHANT];
-        const merchantOperator = values?.[FILTER_KEYS.MERCHANT_OPERATOR] ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS;
         return (
             <MerchantFilter
-                key={`${baseFilterKey}-${merchantOperator}`}
+                key={baseFilterKey}
                 baseFilterKey={baseFilterKey}
                 value={value}
                 isNegated={isNegated}
-                merchantOperator={merchantOperator}
+                merchantOperator={values?.[FILTER_KEYS.MERCHANT_OPERATOR]}
                 buttonText={buttonText}
                 onChange={onChange}
             />
diff --git a/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx b/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx
index 4275ac9a07ba..4cf7cf356cb3 100644
--- a/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx
+++ b/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx
@@ -34,7 +34,7 @@ function MerchantMatchTypeSelector({value, onChange}: MerchantMatchTypeSelectorP
         },
         {
             keyForList: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
-            text: translate('search.filters.merchant.exactMatch'),
+            text: translate('search.filters.merchant.equalTo'),
             isSelected: value === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
         },
     ];
diff --git a/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx b/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx
index bdf6574e9307..33b6faed72d1 100644
--- a/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx
+++ b/src/components/Search/FilterDropdowns/MerchantFilterPopup.tsx
@@ -1,22 +1,18 @@
 /**
  * Edits the Merchant filter value and match type from its search filter chip.
  */
-import MerchantMatchTypeSelector from '@components/Search/FilterComponents/MerchantMatchTypeSelector';
-import NegatableFilter from '@components/Search/FilterComponents/NegatableFilter';
-import useTextFilterValidation from '@components/Search/hooks/useTextFilterValidation';
-import TextInput from '@components/TextInput';
+import MerchantFilterContent from '@components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent';
 
+import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {getFilterFormValues} from '@libs/SearchQueryUtils';
 import {getFilterNegatableValue} from '@libs/SearchUIUtils';
 
-import CONST from '@src/CONST';
+import type CONST from '@src/CONST';
 import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
-import type {MerchantMatchType, SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
+import type {SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
 
-import React, {useState} from 'react';
-import {View} from 'react-native';
+import React from 'react';
 
 import type {PopoverComponentProps} from './FilterPopupButton';
 
@@ -36,62 +32,35 @@ type MerchantFilterPopupProps = {
 };
 
 function MerchantFilterPopup({baseFilterKey, values, label, updateFilterForm, closeOverlay}: MerchantFilterPopupProps) {
+    const {translate} = useLocalize();
     const styles = useThemeStyles();
+    const {isNegated, value} = getFilterNegatableValue(baseFilterKey, values);
+    const applySentryLabel = `Search-FilterPopupApply-${baseFilterKey}`;
 
-    const {isNegated: initialIsNegated, value: initialValue} = getFilterNegatableValue(baseFilterKey, values);
-    const [isNegated, setIsNegated] = useState(initialIsNegated);
-    const [value, setValue] = useState(initialValue);
-    const shouldShowMerchantMatchType = !isNegated;
-    const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(values?.[FILTER_KEYS.MERCHANT_OPERATOR] ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
-
-    const error = useTextFilterValidation(baseFilterKey, value);
-    const filterInput = (
-        <TextInput
-            placeholder={label}
-            value={value}
-            errorText={error}
-            hasError={!!error}
-            onChangeText={setValue}
-            accessibilityLabel={label}
-            role={CONST.ROLE.PRESENTATION}
-            containerStyles={shouldShowMerchantMatchType ? [styles.ph5, styles.mb5] : [styles.ph5]}
-        />
-    );
-
-    const applyChanges = () => {
-        if (error) {
-            return;
-        }
-        updateFilterForm({
-            ...getFilterFormValues(baseFilterKey, value, isNegated),
-            [FILTER_KEYS.MERCHANT_OPERATOR]: isNegated ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO : merchantOperator,
-        });
+    const applyChanges = (newValues: Partial<SearchAdvancedFiltersForm>) => {
+        updateFilterForm(newValues);
         closeOverlay();
     };
 
+    // The content renders its own padded Apply button, so the popup only provides the label and the spacing ActionButtons would add.
     return (
         <BasePopup
             label={label}
-            onApply={applyChanges}
-            applySentryLabel={`Search-FilterPopupApply-${baseFilterKey}`}
+            shouldShowActionButtons={false}
+            style={styles.pb0}
+            onApply={closeOverlay}
+            applySentryLabel={applySentryLabel}
         >
-            <NegatableFilter
+            <MerchantFilterContent
                 baseFilterKey={baseFilterKey}
+                value={value}
                 isNegated={isNegated}
-                onNegationChange={setIsNegated}
-            >
-                {shouldShowMerchantMatchType ? (
-                    <View>
-                        {filterInput}
-                        <MerchantMatchTypeSelector
-                            value={merchantOperator}
-                            onChange={setMerchantOperator}
-                        />
-                    </View>
-                ) : (
-                    filterInput
-                )}
-            </NegatableFilter>
+                merchantOperator={values?.[FILTER_KEYS.MERCHANT_OPERATOR]}
+                buttonText={translate('common.apply')}
+                sentryLabel={applySentryLabel}
+                buttonStyles={styles.mt2}
+                onChange={applyChanges}
+            />
         </BasePopup>
     );
 }
diff --git a/src/components/Search/FilterDropdowns/TextFilterPopup.tsx b/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
index 98751dbf485b..11200fec643f 100644
--- a/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
+++ b/src/components/Search/FilterDropdowns/TextFilterPopup.tsx
@@ -33,18 +33,6 @@ function TextFilterPopup({baseFilterKey, values, label, updateFilterForm, closeO
     const [value, setValue] = useState(initialValue);
 
     const error = useTextFilterValidation(baseFilterKey, value);
-    const filterInput = (
-        <TextInput
-            placeholder={label}
-            value={value}
-            errorText={error}
-            hasError={!!error}
-            onChangeText={setValue}
-            accessibilityLabel={label}
-            role={CONST.ROLE.PRESENTATION}
-            containerStyles={[styles.ph5]}
-        />
-    );
 
     const applyChanges = () => {
         if (error) {
@@ -66,7 +54,16 @@ function TextFilterPopup({baseFilterKey, values, label, updateFilterForm, closeO
                 isNegated={isNegated}
                 onNegationChange={setIsNegated}
             >
-                {filterInput}
+                <TextInput
+                    placeholder={label}
+                    value={value}
+                    errorText={error}
+                    hasError={!!error}
+                    onChangeText={setValue}
+                    accessibilityLabel={label}
+                    role={CONST.ROLE.PRESENTATION}
+                    containerStyles={[styles.ph5]}
+                />
             </NegatableFilter>
         </BasePopup>
     );
diff --git a/src/languages/de.ts b/src/languages/de.ts
index 75ccc63c325b..f984fe632e00 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -9830,7 +9830,11 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Export',
             },
             filterType: {label: 'Filtertyp', has: {positive: 'hat', negative: 'hat nicht'}, is: {positive: 'ist', negative: 'ist nicht'}},
-            merchant: {matchType: 'Übereinstimmungstyp', contains: 'Enthält', exactMatch: 'Gleich'},
+            merchant: {
+                matchType: 'Übereinstimmungstyp',
+                contains: (merchant?: string) => (merchant ? `Enthält "${merchant}"` : 'Enthält'),
+                equalTo: (merchant?: string) => (merchant ? `Gleich "${merchant}"` : 'Gleich'),
+            },
             created: 'Erstellt',
             createdDate: 'Erstellungsdatum',
             transactionStatus: {
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 27ab9f541f44..744ea1664b32 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -10038,7 +10038,11 @@ ${reportName}`,
                 has: {positive: 'έχει', negative: 'δεν έχει'},
                 is: {positive: 'είναι', negative: 'δεν είναι'},
             },
-            merchant: {matchType: 'Τύπος αντιστοίχισης', contains: 'Περιέχει', exactMatch: 'Ίσο με'},
+            merchant: {
+                matchType: 'Τύπος αντιστοίχισης',
+                contains: (merchant?: string) => (merchant ? `Περιέχει "${merchant}"` : 'Περιέχει'),
+                equalTo: (merchant?: string) => (merchant ? `Ίσο με "${merchant}"` : 'Ίσο με'),
+            },
             created: 'Δημιουργήθηκε',
             createdDate: 'Ημερομηνία δημιουργίας',
             transactionStatus: {
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 6a30c5f88306..67f38a9ff6c7 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -9953,8 +9953,8 @@ const translations = {
             },
             merchant: {
                 matchType: 'Match type',
-                contains: 'Contains',
-                exactMatch: 'Equal to',
+                contains: (merchant?: string) => (merchant ? `Contains "${merchant}"` : 'Contains'),
+                equalTo: (merchant?: string) => (merchant ? `Equal to "${merchant}"` : 'Equal to'),
             },
             card: {
                 expensify: 'Expensify',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index a8e54fdee445..b3574d690f3e 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -9688,7 +9688,11 @@ ${reportName}`,
             },
             reportField: (name, value) => `${name} es ${value}`,
             filterType: {label: 'Tipo de filtro', has: {positive: 'tiene', negative: 'no tiene'}, is: {positive: 'es', negative: 'no es'}},
-            merchant: {matchType: 'Tipo de coincidencia', contains: 'Contiene', exactMatch: 'Igual a'},
+            merchant: {
+                matchType: 'Tipo de coincidencia',
+                contains: (merchant) => (merchant ? `Contiene "${merchant}"` : 'Contiene'),
+                equalTo: (merchant) => (merchant ? `Igual a "${merchant}"` : 'Igual a'),
+            },
             created: 'Creado',
             createdDate: 'Fecha de creación',
             transactionStatus: {
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 25a093806f35..f570b67c4c43 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -9852,7 +9852,11 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exporter',
             },
             filterType: {label: 'Type de filtre', has: {positive: 'a', negative: 'n’a pas'}, is: {positive: 'est', negative: 'n’est pas'}},
-            merchant: {matchType: 'Type de correspondance', contains: 'Contient', exactMatch: 'Égal à'},
+            merchant: {
+                matchType: 'Type de correspondance',
+                contains: (merchant?: string) => (merchant ? `Contient "${merchant}"` : 'Contient'),
+                equalTo: (merchant?: string) => (merchant ? `Égal à "${merchant}"` : 'Égal à'),
+            },
             created: 'Créé',
             createdDate: 'Date de création',
             transactionStatus: {
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 3771b9bb0a69..ab44e6acf015 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -9786,7 +9786,11 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Esporta',
             },
             filterType: {label: 'Tipo di filtro', has: {positive: 'ha', negative: 'non ha'}, is: {positive: 'è', negative: 'non è'}},
-            merchant: {matchType: 'Tipo di corrispondenza', contains: 'Contiene', exactMatch: 'Uguale a'},
+            merchant: {
+                matchType: 'Tipo di corrispondenza',
+                contains: (merchant?: string) => (merchant ? `Contiene "${merchant}"` : 'Contiene'),
+                equalTo: (merchant?: string) => (merchant ? `Uguale a "${merchant}"` : 'Uguale a'),
+            },
             created: 'Creato',
             createdDate: 'Data di creazione',
             transactionStatus: {
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index cba9acff13ca..ffe83ccaf121 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -9649,7 +9649,11 @@ ${reportName}`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'エクスポート',
             },
             filterType: {label: 'フィルタータイプ', has: {positive: '持っています', negative: '持っていません'}, is: {positive: 'は', negative: 'ではありません'}},
-            merchant: {matchType: 'マッチタイプ', contains: '含む', exactMatch: '等しい'},
+            merchant: {
+                matchType: 'マッチタイプ',
+                contains: (merchant?: string) => (merchant ? `"${merchant}"を含む` : '含む'),
+                equalTo: (merchant?: string) => (merchant ? `"${merchant}"に等しい` : '等しい'),
+            },
             created: '作成しました',
             createdDate: '作成日',
             transactionStatus: {
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index e1aca5b6c068..70d77569eb87 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -9753,7 +9753,11 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exporteren',
             },
             filterType: {label: 'Filtertype', has: {positive: 'heeft', negative: 'heeft niet'}, is: {positive: 'is', negative: 'is niet'}},
-            merchant: {matchType: 'Overeenkomsttype', contains: 'Bevat', exactMatch: 'Gelijk aan'},
+            merchant: {
+                matchType: 'Overeenkomsttype',
+                contains: (merchant?: string) => (merchant ? `Bevat "${merchant}"` : 'Bevat'),
+                equalTo: (merchant?: string) => (merchant ? `Gelijk aan "${merchant}"` : 'Gelijk aan'),
+            },
             created: 'Aangemaakt',
             createdDate: 'Aanmaakdatum',
             transactionStatus: {
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index f6c7ee0f234b..2fbf38679776 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -9772,7 +9772,11 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Eksportuj',
             },
             filterType: {label: 'Typ filtra', has: {positive: 'ma', negative: 'nie ma'}, is: {positive: 'jest', negative: 'nie jest'}},
-            merchant: {matchType: 'Typ dopasowania', contains: 'Zawiera', exactMatch: 'Równe'},
+            merchant: {
+                matchType: 'Typ dopasowania',
+                contains: (merchant?: string) => (merchant ? `Zawiera "${merchant}"` : 'Zawiera'),
+                equalTo: (merchant?: string) => (merchant ? `Równe "${merchant}"` : 'Równe'),
+            },
             created: 'Utworzono',
             createdDate: 'Data utworzenia',
             transactionStatus: {
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index b384b2231441..9d9b012d7d26 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -9751,7 +9751,11 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: 'Exportar',
             },
             filterType: {label: 'Tipo de filtro', has: {positive: 'tem', negative: 'não tem'}, is: {positive: 'é', negative: 'não é'}},
-            merchant: {matchType: 'Tipo de correspondência', contains: 'Contém', exactMatch: 'Igual a'},
+            merchant: {
+                matchType: 'Tipo de correspondência',
+                contains: (merchant?: string) => (merchant ? `Contém "${merchant}"` : 'Contém'),
+                equalTo: (merchant?: string) => (merchant ? `Igual a "${merchant}"` : 'Igual a'),
+            },
             created: 'Criado',
             createdDate: 'Data de criação',
             transactionStatus: {
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 5b4a1356e53b..d9eb4f5fcf54 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -9387,7 +9387,11 @@ ${reportName}`,
                 [CONST.SEARCH.ACTION_FILTERS.EXPORT]: '导出',
             },
             filterType: {label: '筛选类型', has: {positive: '有', negative: '没有'}, is: {positive: '是', negative: '不是'}},
-            merchant: {matchType: '匹配类型', contains: '包含', exactMatch: '等于'},
+            merchant: {
+                matchType: '匹配类型',
+                contains: (merchant?: string) => (merchant ? `包含 "${merchant}"` : '包含'),
+                equalTo: (merchant?: string) => (merchant ? `等于 "${merchant}"` : '等于'),
+            },
             created: '已创建',
             createdDate: '创建日期',
             transactionStatus: {
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index 2bd3c373b69f..8708d12fd64f 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -1200,18 +1200,6 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
 
     // We separate type and status filters from other filters to maintain hashes consistency for saved searches
     const {type, groupBy, view, columns, limit, [FILTER_KEYS.MERCHANT_OPERATOR]: merchantOperator, ...otherFilters} = supportedFilterValues;
-    const merchantFilters = options?.flatFilters?.filter((filter) => filter.key === FILTER_KEYS.MERCHANT) ?? [];
-    const positiveMerchantFilters = merchantFilters.filter((filter) => !filter.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO));
-    const negativeMerchantFilters = merchantFilters.filter((filter) => filter.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO));
-    const wasMerchantNegated = negativeMerchantFilters.length > 0;
-    const isMerchantNegated = !!supportedFilterValues.merchantNot;
-    const hasMerchantNegationChanged = wasMerchantNegated !== isMerchantNegated;
-    const lastVisibleMerchantFilter = (wasMerchantNegated ? negativeMerchantFilters : positiveMerchantFilters).at(-1);
-    const selectedMerchantOperator = getMerchantOperator(merchantOperator);
-    const currentMerchantOperator = positiveMerchantFilters.at(-1)?.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO)
-        ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO
-        : DEFAULT_MERCHANT_OPERATOR;
-    const hasMerchantOperatorChanged = !isMerchantNegated && selectedMerchantOperator !== currentMerchantOperator;
     const filtersString: string[] = [];
 
     if (options?.sortBy) {
@@ -1277,10 +1265,22 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
                 if (keyInCorrectForm) {
                     let operator: ValueOf<typeof operatorToCharMap> | typeof EXPLICIT_EQUAL_TO_OPERATOR = operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO];
                     if (filterKey === FILTER_KEYS.MERCHANT) {
+                        const merchantFilters = options?.flatFilters?.filter((filter) => filter.key === FILTER_KEYS.MERCHANT) ?? [];
+                        const positiveMerchantFilters = merchantFilters.filter((filter) => !filter.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO));
+                        const negativeMerchantFilters = merchantFilters.filter((filter) => filter.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO));
+                        const wasMerchantNegated = negativeMerchantFilters.length > 0;
+                        const isMerchantNegated = !!supportedFilterValues.merchantNot;
+                        const hasMerchantNegationChanged = wasMerchantNegated !== isMerchantNegated;
+                        const lastVisibleMerchantFilter = (wasMerchantNegated ? negativeMerchantFilters : positiveMerchantFilters).at(-1);
+                        const selectedMerchantOperator = getMerchantOperator(merchantOperator);
                         const originalMerchantFilters = isNegated ? negativeMerchantFilters : positiveMerchantFilters;
                         const lastMerchantFilter = hasMerchantNegationChanged ? lastVisibleMerchantFilter : originalMerchantFilters.at(-1);
                         const isMerchantValueUnchanged = filterValue === lastMerchantFilter?.filters.map((item) => item.value.toString()).join(',');
                         if (lastMerchantFilter && isMerchantValueUnchanged) {
+                            const currentMerchantOperator = positiveMerchantFilters.at(-1)?.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO)
+                                ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO
+                                : DEFAULT_MERCHANT_OPERATOR;
+                            const hasMerchantOperatorChanged = !isMerchantNegated && selectedMerchantOperator !== currentMerchantOperator;
                             const hasMerchantConditionChanged = hasMerchantNegationChanged || hasMerchantOperatorChanged;
                             const filtersToUpdate = hasMerchantConditionChanged ? merchantFilters : originalMerchantFilters;
                             const updatedOperator = isNegated ? CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO : selectedMerchantOperator;
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index b29a29e9d89e..951a012a516b 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -5914,8 +5914,8 @@ function getDisplayValue(
             return;
         }
 
-        const matchTypeKey = form[FILTER_KEYS.MERCHANT_OPERATOR] === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO ? 'search.filters.merchant.exactMatch' : 'search.filters.merchant.contains';
-        return `${translate(matchTypeKey)} "${merchant}"`;
+        const matchTypeKey = form[FILTER_KEYS.MERCHANT_OPERATOR] === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO ? 'search.filters.merchant.equalTo' : 'search.filters.merchant.contains';
+        return translate(matchTypeKey, merchant);
     }
 
     if (key === FILTER_KEYS.TRANSACTION_STATUS) {
@@ -5970,6 +5970,11 @@ function hasFilterContentValuesChanged(
         return true;
     }
 
+    // The Merchant content also reads its match type.
+    if (baseFilterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT) {
+        return previousValues?.[FILTER_KEYS.MERCHANT_OPERATOR] !== values?.[FILTER_KEYS.MERCHANT_OPERATOR];
+    }
+
     if (isTextFilterKey(baseFilterKey)) {
         return false;
     }
diff --git a/tests/ui/MerchantFilterContentTest.tsx b/tests/ui/MerchantFilterContentTest.tsx
index f58051caea92..be459e4789fb 100644
--- a/tests/ui/MerchantFilterContentTest.tsx
+++ b/tests/ui/MerchantFilterContentTest.tsx
@@ -7,50 +7,47 @@ import MerchantFilterContentPageWrapper from '@pages/Search/SearchAdvancedFilter
 
 import CONST from '@src/CONST';
 import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
+import type {MerchantMatchType} from '@src/types/form/SearchAdvancedFiltersForm';
 
 import {NavigationContainer} from '@react-navigation/native';
 
 jest.mock('@hooks/useAutoFocusInput', () => () => ({inputCallbackRef: jest.fn()}));
 jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
 
-function renderMerchantFilter(onChange = jest.fn(), merchantOperator = CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS) {
-    return {
-        onChange,
-        ...render(
-            <NavigationContainer>
-                <MerchantFilterContent
-                    baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}
-                    value="I"
-                    isNegated={false}
-                    merchantOperator={merchantOperator}
-                    onChange={onChange}
-                />
-            </NavigationContainer>,
-        ),
-    };
+function renderMerchantFilter({value = 'I', isNegated = false, merchantOperator}: {value?: string; isNegated?: boolean; merchantOperator?: MerchantMatchType} = {}) {
+    const onChange = jest.fn();
+    render(
+        <NavigationContainer>
+            <MerchantFilterContent
+                baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}
+                value={value}
+                isNegated={isNegated}
+                merchantOperator={merchantOperator}
+                onChange={onChange}
+            />
+        </NavigationContainer>,
+    );
+    return {onChange};
 }
 
 describe('MerchantFilterContent', () => {
-    afterEach(() => {
-        jest.clearAllMocks();
-    });
-
     it('keeps the merchant input fixed above the match type options', () => {
-        const {onChange} = renderMerchantFilter();
+        // Given a positive Merchant filter
+        const {onChange} = renderMerchantFilter({merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS});
         const merchantInput = screen.getByLabelText('common.merchant');
 
-        expect(screen.getByText('search.filters.merchant.matchType')).toBeOnTheScreen();
-        expect(screen.getByText('search.filters.merchant.contains')).toBeOnTheScreen();
-        expect(screen.getByText('search.filters.merchant.exactMatch')).toBeOnTheScreen();
-
+        // When the user edits the value and switches to Equal to
         fireEvent.changeText(merchantInput, 'Ibis');
-        fireEvent.press(screen.getByText('search.filters.merchant.exactMatch'));
+        fireEvent.press(screen.getByText('search.filters.merchant.equalTo'));
 
+        // Then the same input keeps the edited value, so switching the match type does not reset what the user typed
         expect(screen.getByLabelText('common.merchant')).toBe(merchantInput);
         expect(screen.getByDisplayValue('Ibis')).toBeOnTheScreen();
 
+        // When the user confirms
         fireEvent.press(screen.getByText('common.confirm'));
 
+        // Then the exact operator is submitted with the edited value
         expect(onChange).toHaveBeenCalledWith({
             [FILTER_KEYS.MERCHANT]: 'Ibis',
             [FILTER_KEYS.MERCHANT_NOT]: undefined,
@@ -58,11 +55,14 @@ describe('MerchantFilterContent', () => {
         });
     });
 
-    it('submits the selected Contains operator', () => {
-        const {onChange} = renderMerchantFilter();
+    it.each([CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS, undefined])('submits Contains when the stored operator is %s', (merchantOperator) => {
+        // Given a Merchant filter stored as Contains, or with no operator from an older query
+        const {onChange} = renderMerchantFilter({merchantOperator});
 
+        // When the user confirms without changing the match type
         fireEvent.press(screen.getByText('common.confirm'));
 
+        // Then Contains is submitted, because it is the default Merchant match type
         expect(onChange).toHaveBeenCalledWith({
             [FILTER_KEYS.MERCHANT]: 'I',
             [FILTER_KEYS.MERCHANT_NOT]: undefined,
@@ -70,13 +70,14 @@ describe('MerchantFilterContent', () => {
         });
     });
 
-    it('applies the Merchant filter directly when the page supplies an Apply label', () => {
+    it('routes the Merchant filter through the advanced filters content with its stored operator', () => {
+        // Given the advanced filters page renders a stored exact Merchant filter with an Apply label
         const onChange = jest.fn();
         render(
             <NavigationContainer>
                 <SearchAdvancedFiltersContent
                     baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}
-                    values={{merchant: 'I', merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS}}
+                    values={{merchant: 'I', merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO}}
                     buttonText="common.apply"
                     components={{Merchant: MerchantFilterContentPageWrapper, Text: () => null, Amount: () => null, Date: () => null, ReportField: () => null, List: () => null}}
                     onChange={onChange}
@@ -84,57 +85,27 @@ describe('MerchantFilterContent', () => {
             </NavigationContainer>,
         );
 
-        expect(screen.queryByText('common.confirm')).not.toBeOnTheScreen();
+        // When the user applies the filter
         fireEvent.press(screen.getByText('common.apply'));
 
+        // Then the stored exact operator is kept, so the Merchant content received it from the form values
         expect(onChange).toHaveBeenCalledWith({
             [FILTER_KEYS.MERCHANT]: 'I',
             [FILTER_KEYS.MERCHANT_NOT]: undefined,
-            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
-        });
-    });
-
-    it('defaults to Contains when no Merchant operator is stored', () => {
-        const onChange = jest.fn();
-        render(
-            <NavigationContainer>
-                <MerchantFilterContent
-                    baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}
-                    value="I"
-                    isNegated={false}
-                    onChange={onChange}
-                />
-            </NavigationContainer>,
-        );
-
-        fireEvent.press(screen.getByText('common.confirm'));
-
-        expect(onChange).toHaveBeenCalledWith({
-            [FILTER_KEYS.MERCHANT]: 'I',
-            [FILTER_KEYS.MERCHANT_NOT]: undefined,
-            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
         });
     });
 
     it('retains the value when changing a stored negative filter back to positive', () => {
-        const onChange = jest.fn();
-        render(
-            <NavigationContainer>
-                <MerchantFilterContent
-                    baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}
-                    value="Prime"
-                    isNegated
-                    merchantOperator={CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO}
-                    onChange={onChange}
-                />
-            </NavigationContainer>,
-        );
+        // Given a stored negated Merchant filter
+        const {onChange} = renderMerchantFilter({value: 'Prime', isNegated: true});
 
+        // When the user switches it to positive and picks Contains
         fireEvent.press(screen.getByText('search.filters.filterType.is.positive'));
-        expect(screen.getByDisplayValue('Prime')).toBeOnTheScreen();
         fireEvent.press(screen.getByText('search.filters.merchant.contains'));
         fireEvent.press(screen.getByText('common.confirm'));
 
+        // Then the negated value moves to the positive filter instead of being cleared
         expect(onChange).toHaveBeenCalledWith({
             [FILTER_KEYS.MERCHANT]: 'Prime',
             [FILTER_KEYS.MERCHANT_NOT]: undefined,
@@ -142,23 +113,24 @@ describe('MerchantFilterContent', () => {
         });
     });
 
-    it('hides match type controls and uses exact matching when the filter is negated', () => {
-        const {onChange} = renderMerchantFilter();
-        const merchantInput = screen.getByLabelText('common.merchant');
+    it('hides the match type and submits no operator when the filter is negated', () => {
+        // Given a positive Merchant filter
+        const {onChange} = renderMerchantFilter({merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS});
 
+        // When the user negates it
         fireEvent.press(screen.getByText('search.filters.filterType.is.negative'));
 
+        // Then the match type is hidden, because a negated Merchant filter always uses the not-equal operator
         expect(screen.queryByText('search.filters.merchant.matchType')).not.toBeOnTheScreen();
-        expect(screen.queryByText('search.filters.merchant.contains')).not.toBeOnTheScreen();
-        expect(screen.queryByText('search.filters.merchant.exactMatch')).not.toBeOnTheScreen();
-        expect(screen.getByLabelText('common.merchant')).toBe(merchantInput);
 
+        // When the user confirms
         fireEvent.press(screen.getByText('common.confirm'));
 
+        // Then only the negated value is submitted
         expect(onChange).toHaveBeenCalledWith({
             [FILTER_KEYS.MERCHANT]: undefined,
             [FILTER_KEYS.MERCHANT_NOT]: 'I',
-            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: undefined,
         });
     });
 });
diff --git a/tests/ui/MerchantFilterPopupTest.tsx b/tests/ui/MerchantFilterPopupTest.tsx
index 51fe742adab5..78f6ef3e97b9 100644
--- a/tests/ui/MerchantFilterPopupTest.tsx
+++ b/tests/ui/MerchantFilterPopupTest.tsx
@@ -4,119 +4,39 @@ import MerchantFilterPopup from '@components/Search/FilterDropdowns/MerchantFilt
 
 import CONST from '@src/CONST';
 import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
-import type {SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
 
 import {NavigationContainer} from '@react-navigation/native';
 
+jest.mock('@hooks/useAutoFocusInput', () => () => ({inputCallbackRef: jest.fn()}));
 jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
 jest.mock('@hooks/useResponsiveLayout', () => () => ({isSmallScreenWidth: false}));
 
-function renderMerchantPopup(hasStoredMerchantOperator = true, values: Partial<SearchAdvancedFiltersForm> = {}) {
-    const closeOverlay = jest.fn();
-    const updateFilterForm = jest.fn<void, [Partial<SearchAdvancedFiltersForm>]>();
-
-    const rendered = render(
-        <NavigationContainer>
-            <MerchantFilterPopup
-                baseFilterKey={FILTER_KEYS.MERCHANT}
-                values={{
-                    [FILTER_KEYS.MERCHANT]: 'I',
-                    ...(hasStoredMerchantOperator ? {[FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS} : {}),
-                    ...values,
-                }}
-                label="common.merchant"
-                closeOverlay={closeOverlay}
-                updateFilterForm={updateFilterForm}
-            />
-        </NavigationContainer>,
-    );
-
-    return {closeOverlay, updateFilterForm, ...rendered};
-}
-
 describe('MerchantFilterPopup', () => {
-    afterEach(() => {
-        jest.clearAllMocks();
-    });
-
-    it('shows and submits the Merchant match type', () => {
-        const {closeOverlay, updateFilterForm} = renderMerchantPopup();
-
-        expect(screen.getByText('search.filters.merchant.matchType')).toBeOnTheScreen();
-        expect(screen.getByText('search.filters.merchant.contains')).toBeOnTheScreen();
-        expect(screen.getByText('search.filters.merchant.exactMatch')).toBeOnTheScreen();
-
-        fireEvent.press(screen.getByText('search.filters.merchant.exactMatch'));
+    it('applies the Merchant filter and closes the popup', () => {
+        // Given a Merchant chip popup with a stored Contains filter
+        const closeOverlay = jest.fn();
+        const updateFilterForm = jest.fn();
+        render(
+            <NavigationContainer>
+                <MerchantFilterPopup
+                    baseFilterKey={FILTER_KEYS.MERCHANT}
+                    values={{[FILTER_KEYS.MERCHANT]: 'I', [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS}}
+                    label="common.merchant"
+                    closeOverlay={closeOverlay}
+                    updateFilterForm={updateFilterForm}
+                />
+            </NavigationContainer>,
+        );
+
+        // When the user applies the filter
         fireEvent.press(screen.getByText('common.apply'));
 
+        // Then the popup submits the Merchant values and closes, because the chip applies changes immediately
         expect(updateFilterForm).toHaveBeenCalledWith({
             [FILTER_KEYS.MERCHANT]: 'I',
             [FILTER_KEYS.MERCHANT_NOT]: undefined,
-            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
-        });
-        expect(closeOverlay).toHaveBeenCalledTimes(1);
-    });
-
-    it('keeps the exact operator and edited value when reopened', () => {
-        const first = renderMerchantPopup();
-        fireEvent.changeText(screen.getByLabelText('common.merchant'), 'Ibis');
-        fireEvent.press(screen.getByText('search.filters.merchant.exactMatch'));
-        fireEvent.press(screen.getByText('common.apply'));
-        const savedValues = first.updateFilterForm.mock.calls.at(0)?.at(0);
-        first.unmount();
-
-        const reopened = renderMerchantPopup(true, savedValues);
-        expect(screen.getByDisplayValue('Ibis')).toBeOnTheScreen();
-        fireEvent.press(screen.getByText('common.apply'));
-        expect(reopened.updateFilterForm).toHaveBeenCalledWith({
-            [FILTER_KEYS.MERCHANT]: 'Ibis',
-            [FILTER_KEYS.MERCHANT_NOT]: undefined,
-            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
-        });
-    });
-
-    it('defaults to Contains when no Merchant operator is stored', () => {
-        const {updateFilterForm} = renderMerchantPopup(false);
-
-        fireEvent.press(screen.getByText('common.apply'));
-
-        expect(updateFilterForm).toHaveBeenCalledWith({
-            [FILTER_KEYS.MERCHANT]: 'I',
-            [FILTER_KEYS.MERCHANT_NOT]: undefined,
-            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
-        });
-    });
-
-    it('retains the value when changing a stored negative filter back to positive', () => {
-        const {updateFilterForm} = renderMerchantPopup(true, {merchant: undefined, merchantNot: 'Prime', merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO});
-
-        fireEvent.press(screen.getByText('search.filters.filterType.is.positive'));
-        expect(screen.getByDisplayValue('Prime')).toBeOnTheScreen();
-        fireEvent.press(screen.getByText('search.filters.merchant.contains'));
-        fireEvent.press(screen.getByText('common.apply'));
-
-        expect(updateFilterForm).toHaveBeenCalledWith({
-            [FILTER_KEYS.MERCHANT]: 'Prime',
-            [FILTER_KEYS.MERCHANT_NOT]: undefined,
             [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
         });
-    });
-
-    it('hides the match type and submits exact matching for a negated Merchant', () => {
-        const {updateFilterForm} = renderMerchantPopup();
-
-        fireEvent.press(screen.getByText('search.filters.filterType.is.negative'));
-
-        expect(screen.queryByText('search.filters.merchant.matchType')).not.toBeOnTheScreen();
-        expect(screen.queryByText('search.filters.merchant.contains')).not.toBeOnTheScreen();
-        expect(screen.queryByText('search.filters.merchant.exactMatch')).not.toBeOnTheScreen();
-
-        fireEvent.press(screen.getByText('common.apply'));
-
-        expect(updateFilterForm).toHaveBeenCalledWith({
-            [FILTER_KEYS.MERCHANT]: undefined,
-            [FILTER_KEYS.MERCHANT_NOT]: 'I',
-            [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
-        });
+        expect(closeOverlay).toHaveBeenCalledTimes(1);
     });
 });
diff --git a/tests/ui/TextInputFilterContentTest.tsx b/tests/ui/TextInputFilterContentTest.tsx
deleted file mode 100644
index 62879fa431a7..000000000000
--- a/tests/ui/TextInputFilterContentTest.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import {fireEvent, render, screen} from '@testing-library/react-native';
-
-import TextInputFilterContent from '@components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent';
-
-import CONST from '@src/CONST';
-
-import {NavigationContainer} from '@react-navigation/native';
-
-jest.mock('@hooks/useAutoFocusInput', () => () => ({inputCallbackRef: jest.fn()}));
-jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
-
-function renderDescriptionFilter(onChange = jest.fn()) {
-    return {
-        onChange,
-        ...render(
-            <NavigationContainer>
-                <TextInputFilterContent
-                    baseFilterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.DESCRIPTION}
-                    value="I"
-                    isNegated={false}
-                    onChange={onChange}
-                />
-            </NavigationContainer>,
-        ),
-    };
-}
-
-describe('TextInputFilterContent', () => {
-    afterEach(() => {
-        jest.clearAllMocks();
-    });
-
-    it('submits a generic Description filter with two onChange arguments and no match type selector', () => {
-        const {onChange} = renderDescriptionFilter();
-
-        expect(screen.queryByText('search.filters.merchant.matchType')).not.toBeOnTheScreen();
-        fireEvent.press(screen.getByText('common.confirm'));
-
-        expect(onChange).toHaveBeenCalledWith('I', false);
-        expect(onChange.mock.calls.at(0)).toHaveLength(2);
-    });
-});
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index 4cb6ca965201..ec24e9e7fe69 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -624,26 +624,14 @@ describe('SearchQueryUtils', () => {
             expect(result).toEqual('type:expense policyID:67890 merchant*:Amazon description:Electronics laptop category:electronics,gadgets');
         });
 
-        test('defaults a merchant filter without an operator to contains', () => {
-            const filterValues: Partial<SearchAdvancedFiltersForm> = {
-                type: 'expense',
-                merchant: 'Amazon',
-            };
-
-            const result = buildQueryStringFromFilterFormValues(filterValues);
-
-            expect(result).toEqual('type:expense merchant*:Amazon');
-        });
-
-        test('builds contains merchant query when merchant operator is contains', () => {
-            const filterValues: Partial<SearchAdvancedFiltersForm> = {
-                type: 'expense',
-                merchant: 'Amazon',
-                merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
-            };
+        test.each([CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS, undefined])('builds a contains merchant query when the merchant operator is %s', (merchantOperator) => {
+            // Given a merchant filter stored as contains, or with no operator
+            const filterValues: Partial<SearchAdvancedFiltersForm> = {type: 'expense', merchant: 'Amazon', merchantOperator};
 
+            // When the query string is built
             const result = buildQueryStringFromFilterFormValues(filterValues);
 
+            // Then it uses contains, because partial matching is the default merchant behavior
             expect(result).toEqual('type:expense merchant*:Amazon');
         });
 
@@ -1397,52 +1385,22 @@ describe('SearchQueryUtils', () => {
     });
 
     describe('buildFilterFormValuesFromQuery', () => {
-        test('restores exact merchant operator from explicit exact query', () => {
-            const queryJSON = buildSearchQueryJSON('sortBy:date sortOrder:desc type:expense merchant=Uber');
-
-            if (!queryJSON) {
-                throw new Error('Failed to parse query string');
-            }
-
-            const result = buildFilterFormValuesFromQuery(queryJSON, {}, {}, {}, {}, {}, {});
-
-            expect(result).toEqual({
-                type: 'expense',
-                merchant: 'Uber',
-                merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
-            });
-        });
-
-        test('restores legacy merchant operator as contains', () => {
-            const queryJSON = buildSearchQueryJSON('sortBy:date sortOrder:desc type:expense merchant:Uber');
-
-            if (!queryJSON) {
-                throw new Error('Failed to parse query string');
-            }
-
-            const result = buildFilterFormValuesFromQuery(queryJSON, {}, {}, {}, {}, {}, {});
-
-            expect(result).toEqual({
-                type: 'expense',
-                merchant: 'Uber',
-                merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
-            });
-        });
-
-        test('restores contains merchant operator from query', () => {
-            const queryJSON = buildSearchQueryJSON('sortBy:date sortOrder:desc type:expense merchant*:Uber');
-
+        test.each([
+            ['merchant=Uber', CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO],
+            ['merchant:Uber', CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS],
+            ['merchant*:Uber', CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS],
+        ])('restores the merchant operator from %s', (merchantQuery, merchantOperator) => {
+            // Given a query with an explicit exact, legacy, or contains merchant filter
+            const queryJSON = buildSearchQueryJSON(`sortBy:date sortOrder:desc type:expense ${merchantQuery}`);
             if (!queryJSON) {
                 throw new Error('Failed to parse query string');
             }
 
+            // When the form values are built from the query
             const result = buildFilterFormValuesFromQuery(queryJSON, {}, {}, {}, {}, {}, {});
 
-            expect(result).toEqual({
-                type: 'expense',
-                merchant: 'Uber',
-                merchantOperator: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
-            });
+            // Then only `=` restores Equal to, because legacy `:` keeps its partial-match behavior
+            expect(result).toEqual({type: 'expense', merchant: 'Uber', merchantOperator});
         });
 
         test('category filter includes empty values', () => {
@@ -3065,30 +3023,30 @@ describe('SearchQueryUtils', () => {
             }
 
             test.each([
+                // Mixed operators, both orders
                 'merchant="Coffee Shop" merchant*:Coffee',
                 'merchant*:Coffee merchant="Coffee Shop"',
-                'merchant*:Tea merchant="Coffee Shop"',
-                'merchant="Coffee Shop" merchant:Coffee',
+                // Mixed operators with lists and quoted commas
                 'merchant="Coffee Shop",Uber merchant*:Coffee,Tea',
                 'merchant="Coffee, Shop" merchant*:"Coffee, Shop"',
+                // Three clauses, and positive mixed with negated
                 'merchant=I merchant*:I merchant*:g',
                 'merchant=I merchant*:I -merchant:Ig',
+                // Same operator repeated
                 'merchant*:Coffee merchant*:Shop',
-                'merchant*:Amazon,Uber',
-                'merchant:Amazon,Uber',
-                'merchant=Amazon,Uber',
-                'merchant*:"Amazon,Uber"',
-                'merchant="Amazon,Uber"',
-                'merchant*:"Coffee, Shop",Uber',
+                // Single clause of each kind
                 'merchant=I',
                 'merchant*:I',
-                '-merchant:I',
+                'merchant=Amazon,Uber',
+                // Negated
                 '-merchant:Amazon -merchant:Prime',
-                '-merchant:Amazon,Prime',
                 '-merchant:"Coffee, Shop",Uber',
             ])('preserves Merchant predicates when changing Currency: %s', (input) => {
+                // Given a query with Merchant predicates
+                // When only the Currency filter changes
                 const {originalQuery, updatedQuery} = updateQuery(input, {currency: ['USD']});
 
+                // Then every Merchant predicate is kept as it was and the Currency filter is added
                 expect(updatedQuery.flatFilters.filter((filter) => filter.key === 'merchant')).toEqual(originalQuery.flatFilters.filter((filter) => filter.key === 'merchant'));
                 expect(updatedQuery.flatFilters).toContainEqual({key: 'currency', filters: [{operator: 'eq', value: 'USD'}]});
             });
@@ -4264,46 +4222,23 @@ describe('SearchQueryUtils', () => {
     });
 
     describe('applyContainsOperatorToTextFields', () => {
-        it('should preserve explicit merchant eq as exact match', () => {
-            const queryJSON = buildSearchQueryJSON('type:expense merchant=coffee');
+        it.each([
+            ['merchant=coffee', CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO],
+            ['merchant:coffee', CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS],
+            ['merchant*:coffee', CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS],
+        ])('should preserve the parsed merchant operator for %s', (merchantQuery, merchantOperator) => {
+            // Given a query with an explicit exact, legacy, or contains merchant filter
+            const queryJSON = buildSearchQueryJSON(`type:expense ${merchantQuery}`);
             if (!queryJSON?.filters) {
                 throw new Error('Expected filters to be defined');
             }
-            const transformed = applyContainsOperatorToTextFields(queryJSON.filters);
-            const merchantNode = findNode(transformed, 'merchant');
-            if (!merchantNode) {
-                throw new Error('Expected merchant node to be found in AST');
-            }
-            expect(merchantNode.operator).toBe(CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
-            expect(merchantNode.right).toBe('coffee');
-        });
 
-        it('should preserve legacy merchant operator as contains', () => {
-            const queryJSON = buildSearchQueryJSON('type:expense merchant:coffee');
-            if (!queryJSON?.filters) {
-                throw new Error('Expected filters to be defined');
-            }
-            const transformed = applyContainsOperatorToTextFields(queryJSON.filters);
-            const merchantNode = findNode(transformed, 'merchant');
-            if (!merchantNode) {
-                throw new Error('Expected merchant node to be found in AST');
-            }
-            expect(merchantNode.operator).toBe(CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
-            expect(merchantNode.right).toBe('coffee');
-        });
+            // When text field operators are normalized
+            const merchantNode = findNode(applyContainsOperatorToTextFields(queryJSON.filters), 'merchant');
 
-        it('should preserve merchant contains operator', () => {
-            const queryJSON = buildSearchQueryJSON('type:expense merchant*:coffee');
-            if (!queryJSON?.filters) {
-                throw new Error('Expected filters to be defined');
-            }
-            const transformed = applyContainsOperatorToTextFields(queryJSON.filters);
-            const merchantNode = findNode(transformed, 'merchant');
-            if (!merchantNode) {
-                throw new Error('Expected merchant node to be found in AST');
-            }
-            expect(merchantNode.operator).toBe(CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
-            expect(merchantNode.right).toBe('coffee');
+            // Then the parsed merchant operator is kept, because the parser already maps legacy `:` to contains
+            expect(merchantNode?.operator).toBe(merchantOperator);
+            expect(merchantNode?.right).toBe('coffee');
         });
 
         it('should transform description eq to contains', () => {
@@ -4367,55 +4302,34 @@ describe('SearchQueryUtils', () => {
     });
 
     describe('serializeQueryJSONForBackend', () => {
-        it('should preserve legacy merchant contains operator in AST filters', () => {
-            const queryJSON = buildSearchQueryJSON('type:expense merchant:coffee');
+        it.each([
+            ['merchant:coffee', CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS],
+            ['merchant*:coffee', CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS],
+            ['merchant=coffee', CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO],
+        ])('should preserve the merchant operator in AST filters for %s', (merchantQuery, merchantOperator) => {
+            // Given a query with a legacy, contains, or explicit exact merchant filter
+            const queryJSON = buildSearchQueryJSON(`type:expense ${merchantQuery}`);
             if (!queryJSON) {
                 throw new Error('Expected queryJSON to be defined');
             }
-            const normalizedFilters = applyContainsOperatorToTextFields(queryJSON.filters);
-            expect(serializeQueryJSONForBackend(queryJSON)).toBe(JSON.stringify({...queryJSON, filters: normalizedFilters, status: ''}));
-            const merchantNode = findNode(normalizedFilters, 'merchant');
-            if (!merchantNode) {
-                throw new Error('Expected merchant node to be found in AST');
-            }
-            expect(merchantNode.operator).toBe(CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
-        });
 
-        it('should preserve contains merchant operator in AST filters', () => {
-            const queryJSON = buildSearchQueryJSON('type:expense merchant*:coffee');
-            if (!queryJSON) {
-                throw new Error('Expected queryJSON to be defined');
-            }
-            expect(serializeQueryJSONForBackend(queryJSON)).toBe(JSON.stringify({...queryJSON, status: ''}));
-            const merchantNode = findNode(queryJSON.filters, 'merchant');
-            if (!merchantNode) {
-                throw new Error('Expected merchant node to be found in AST');
-            }
-            expect(merchantNode.operator).toBe(CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
-        });
+            // When the query is serialized for the backend
+            const result = serializeQueryJSONForBackend(queryJSON);
 
-        it('should preserve explicit merchant exact match', () => {
-            const queryJSON = buildSearchQueryJSON('type:expense merchant=I');
-            if (!queryJSON) {
-                throw new Error('Expected queryJSON to be defined');
-            }
-            expect(serializeQueryJSONForBackend(queryJSON)).toBe(JSON.stringify({...queryJSON, status: ''}));
-            const merchantNode = findNode(queryJSON.filters, 'merchant');
-            if (!merchantNode) {
-                throw new Error('Expected merchant node to be found in AST');
-            }
-            expect(merchantNode.operator).toBe(CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
-            expect(merchantNode.right).toBe('I');
+            // Then the merchant filter is sent unchanged with its parsed operator
+            expect(result).toBe(JSON.stringify({...queryJSON, status: ''}));
+            expect(findNode(queryJSON.filters, 'merchant')?.operator).toBe(merchantOperator);
         });
 
-        it('should preserve exact merchant operator in rawFilterList', () => {
-            const rawFilterList = [{key: CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT, operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, value: 'coffee'}];
-            expect(serializeQueryJSONForBackend({filters: undefined, rawFilterList})).toBe(JSON.stringify({filters: undefined, rawFilterList, status: ''}));
-        });
+        it.each([CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS])('should preserve the %s merchant operator in rawFilterList', (operator) => {
+            // Given a raw merchant filter with an exact or contains operator
+            const rawFilterList = [{key: CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT, operator, value: 'coffee'}];
 
-        it('should preserve contains merchant operator in rawFilterList', () => {
-            const rawFilterList = [{key: CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT, operator: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS, value: 'coffee'}];
-            expect(serializeQueryJSONForBackend({filters: undefined, rawFilterList})).toBe(JSON.stringify({filters: undefined, rawFilterList, status: ''}));
+            // When the query is serialized for the backend
+            const result = serializeQueryJSONForBackend({filters: undefined, rawFilterList});
+
+            // Then the merchant operator is not rewritten
+            expect(result).toBe(JSON.stringify({filters: undefined, rawFilterList, status: ''}));
         });
 
         it('should apply contains to description in rawFilterList', () => {
diff --git a/tests/unit/Search/SearchUIUtilsTest.ts b/tests/unit/Search/SearchUIUtilsTest.ts
index c097c395650a..6ba3a0ba82ff 100644
--- a/tests/unit/Search/SearchUIUtilsTest.ts
+++ b/tests/unit/Search/SearchUIUtilsTest.ts
@@ -14246,40 +14246,19 @@ describe('SearchUIUtils', () => {
             expect(result).toBe(translateLocal('common.read'));
         });
 
-        test('includes the exact match type in a Merchant filter label', () => {
-            const result = SearchUIUtils.getDisplayValue(
-                FILTER_KEYS.MERCHANT,
-                {
-                    [FILTER_KEYS.MERCHANT]: 'I',
-                    [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
-                },
-                CONST.SEARCH.DATA_TYPES.EXPENSE,
-                translateLocal,
-                localeCompare,
-            );
-
-            expect(result).toBe(`${translateLocal('search.filters.merchant.exactMatch')} "I"`);
-        });
-
-        test('includes the contains match type in a Merchant filter label', () => {
-            const result = SearchUIUtils.getDisplayValue(
-                FILTER_KEYS.MERCHANT,
-                {
-                    [FILTER_KEYS.MERCHANT]: 'I',
-                    [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
-                },
-                CONST.SEARCH.DATA_TYPES.EXPENSE,
-                translateLocal,
-                localeCompare,
-            );
-
-            expect(result).toBe(`${translateLocal('search.filters.merchant.contains')} "I"`);
-        });
+        test.each([
+            [CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, 'search.filters.merchant.equalTo'],
+            [CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS, 'search.filters.merchant.contains'],
+            [undefined, 'search.filters.merchant.contains'],
+        ] as const)('includes the %s match type in a Merchant filter label', (merchantOperator, translationKey) => {
+            // Given a Merchant filter with an exact, contains, or missing operator
+            const form = {[FILTER_KEYS.MERCHANT]: 'I', [FILTER_KEYS.MERCHANT_OPERATOR]: merchantOperator};
 
-        test('defaults a Merchant filter label without an operator to contains', () => {
-            const result = SearchUIUtils.getDisplayValue(FILTER_KEYS.MERCHANT, {[FILTER_KEYS.MERCHANT]: 'I'}, CONST.SEARCH.DATA_TYPES.EXPENSE, translateLocal, localeCompare);
+            // When the filter label is built
+            const result = SearchUIUtils.getDisplayValue(FILTER_KEYS.MERCHANT, form, CONST.SEARCH.DATA_TYPES.EXPENSE, translateLocal, localeCompare);
 
-            expect(result).toBe(`${translateLocal('search.filters.merchant.contains')} "I"`);
+            // Then the match type is part of the translated label, so a missing operator reads as contains
+            expect(result).toBe(translateLocal(translationKey, 'I'));
         });
     });
 
@@ -14839,6 +14818,14 @@ describe('hasFilterContentValuesChanged', () => {
             // A text content offers no options, so the search type is nothing to it.
             ignored: [{[SYNTAX_FILTER_KEYS.MERCHANT]: 'a'}, {[SYNTAX_FILTER_KEYS.MERCHANT]: 'a', type: CONST.SEARCH.DATA_TYPES.INVOICE}],
         },
+        {
+            kind: 'merchant, reading its match type',
+            filterKey: SYNTAX_FILTER_KEYS.MERCHANT,
+            read: [
+                {[SYNTAX_FILTER_KEYS.MERCHANT]: 'a', [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS},
+                {[SYNTAX_FILTER_KEYS.MERCHANT]: 'a', [FILTER_KEYS.MERCHANT_OPERATOR]: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO},
+            ],
+        },
         {
             kind: 'amount',
             filterKey: SYNTAX_FILTER_KEYS.AMOUNT,

From b3272ae7c7b6ef16c380c49ab2f3b6c25b76632b Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Wed, 30 Sep 2026 11:01:23 +0700
Subject: [PATCH 31/38] test(search): expect contains for merchant filter in
 compare parser test

---
 tests/unit/SearchParserTest.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/SearchParserTest.ts b/tests/unit/SearchParserTest.ts
index e3bb3f1454ee..acbc906cbd44 100644
--- a/tests/unit/SearchParserTest.ts
+++ b/tests/unit/SearchParserTest.ts
@@ -1709,7 +1709,7 @@ const compareTests = [
             groupBy: CONST.SEARCH.GROUP_BY.CATEGORY,
             compare: CONST.SEARCH.COMPARE.PREVIOUS_PERIOD,
             filters: {
-                operator: 'eq',
+                operator: 'contains',
                 left: 'merchant',
                 right: 'Amazon',
             },

From 45ff0ef2c03bfa92162af5a04cebdf4351e679db Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Wed, 7 Oct 2026 16:09:17 +0700
Subject: [PATCH 32/38] Drop the unrelated ReceiptTypeValues export

The PR exported ReceiptTypeValues by mistake. No file imports it, and knip
flagged it as a new unused export.
---
 src/types/form/SearchAdvancedFiltersForm.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/types/form/SearchAdvancedFiltersForm.ts b/src/types/form/SearchAdvancedFiltersForm.ts
index 81008ef74563..c8de24566052 100644
--- a/src/types/form/SearchAdvancedFiltersForm.ts
+++ b/src/types/form/SearchAdvancedFiltersForm.ts
@@ -942,7 +942,6 @@ export type {
     ExpenseTypeValues,
     MerchantMatchType,
     ReceiptTypeValue,
-    ReceiptTypeValues,
     TransactionStatusValue,
     SearchNegatableFilterKeys,
 };

From cfc6130325d2016f93c94e8337260e0ff6f37abd Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Wed, 7 Oct 2026 16:34:35 +0700
Subject: [PATCH 33/38] Remove the dead exactMatchFilterKeys code path

Merchant is no longer in isTextSearchField, so Merchant eq is sent to the
backend as eq. Group drill-down builds merchant=value and group export
selects with eq, so the exact-match key set no longer changes anything.

Remove withExactMatchFilterKeys, the exactMatch hash identity, the group
export key set, and the exactMatchFilterKeys query field. Add tests that
prove drill-down and export still send exact Merchant matches and that
Description eq still becomes contains.
---
 src/components/Search/types.ts               |  2 -
 src/hooks/useSearchBulkActions.ts            | 19 ++--
 src/libs/SearchQueryUtils.ts                 | 35 ++------
 src/libs/SearchUIUtils.ts                    |  7 +-
 src/libs/actions/Search.ts                   | 23 +++--
 tests/unit/Search/SearchQueryUtilsTest.ts    | 58 +++---------
 tests/unit/Search/SearchUIUtilsTest.ts       | 94 +++++++++++++++++++-
 tests/unit/hooks/useSearchBulkActionsTest.ts | 35 +++++++-
 8 files changed, 159 insertions(+), 114 deletions(-)

diff --git a/src/components/Search/types.ts b/src/components/Search/types.ts
index 1dc2fa805803..52704f19bb6f 100644
--- a/src/components/Search/types.ts
+++ b/src/components/Search/types.ts
@@ -429,8 +429,6 @@ type SearchQueryJSON = {
     similarSearchHash: number;
     flatFilters: QueryFilters;
     isViewExplicitlySet?: boolean;
-    /** Filters generated for a specific group that must keep exact-match semantics when sent to the backend. */
-    exactMatchFilterKeys?: SearchFilterKey[];
 } & SearchQueryAST;
 
 type SearchAutocompleteResult = {
diff --git a/src/hooks/useSearchBulkActions.ts b/src/hooks/useSearchBulkActions.ts
index 96691e2d7ec3..25389fa4f986 100644
--- a/src/hooks/useSearchBulkActions.ts
+++ b/src/hooks/useSearchBulkActions.ts
@@ -7,7 +7,7 @@ import type {PopoverMenuItem} from '@components/PopoverMenu';
 import {useOpenSearchReportSubmitToPopover} from '@components/ReportSubmitToPopoverAnchor';
 import {useSearchQueryContext, useSearchResultsContext, useSearchSelectionActions, useSearchSelectionContext} from '@components/Search/SearchContext';
 import {getSearchGroupCountByKey} from '@components/Search/selectionBuilders';
-import type {BulkPaySelectionData, PaymentData, QueryFilterKey, SearchColumnType, SearchFilterKey, SearchQueryJSON, SelectedReports, SelectedTransactions} from '@components/Search/types';
+import type {BulkPaySelectionData, PaymentData, QueryFilterKey, SearchColumnType, SearchQueryJSON, SelectedReports, SelectedTransactions} from '@components/Search/types';
 
 import {getAccountingIntegrationDisplayName, getExportLabelForConnection, isIntuitEnterpriseSuiteConnection} from '@libs/AccountingUtils';
 import {getExpensifyCardStatementPDF} from '@libs/actions/CompanyCards';
@@ -443,12 +443,6 @@ function getAllMatchingReportQuery(queryJSON: SearchQueryJSON, excludedTransacti
     return buildSearchQueryJSON(buildSearchQueryString({...queryJSON, flatFilters}));
 }
 
-const MERCHANT_GROUP_EXACT_MATCH_FILTER_KEYS = new Set<SearchFilterKey>([CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT]);
-
-function getGroupExportExactMatchFilterKeys(groupBy: SearchQueryJSON['groupBy']): ReadonlySet<SearchFilterKey> | undefined {
-    return groupBy === CONST.SEARCH.GROUP_BY.MERCHANT ? MERCHANT_GROUP_EXACT_MATCH_FILTER_KEYS : undefined;
-}
-
 type ShouldShowBulkDuplicateParams = {
     selectedTransactionsKeys: string[];
     selectedTransactions: Record<string, {reportID?: string; transaction?: Transaction}>;
@@ -1061,9 +1055,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                         templateType,
                         // searchKey changes what the backend query matches (e.g. reconciliation includes Expensify Card cash back),
                         // so the export must send it exactly as search() does or the exported set differs from the viewed set.
-                        jsonQuery: groupExportQueryJSON
-                            ? serializeQueryJSONForBackend({...groupExportQueryJSON, searchKey: currentSearchKey}, getGroupExportExactMatchFilterKeys(queryJSON?.groupBy))
-                            : '{}',
+                        jsonQuery: groupExportQueryJSON ? serializeQueryJSONForBackend({...groupExportQueryJSON, searchKey: currentSearchKey}) : '{}',
                         reportIDList: isGroupExport ? [] : selectedTransactionReportIDs,
                         transactionIDList,
                         policyID,
@@ -1109,7 +1101,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
     const exportSearchType = searchResults?.search.type ?? queryJSON?.type;
 
     const getCSVExportParameters = useCallback(
-        (isBasicExport: boolean, queryJSONToExport: SearchQueryJSON | undefined, exactMatchFilterKeys?: ReadonlySet<SearchFilterKey>) => {
+        (isBasicExport: boolean, queryJSONToExport: SearchQueryJSON | undefined) => {
             const groupBy = getValidGroupBy(queryJSON?.groupBy);
             let columnsToExport: SearchColumnType[];
             let groupColumnsToExport: SearchColumnType[] = [];
@@ -1169,7 +1161,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                       searchKey: currentSearchKey,
                   }
                 : undefined;
-            const jsonQuery = queryToExport ? serializeQueryJSONForBackend(queryToExport, exactMatchFilterKeys) : (JSON.stringify(queryJSONToExport) ?? '');
+            const jsonQuery = queryToExport ? serializeQueryJSONForBackend(queryToExport) : (JSON.stringify(queryJSONToExport) ?? '');
 
             return {
                 jsonQuery,
@@ -1227,8 +1219,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
             let didFail = false;
             const reportIDList = selectedReports.length > 0 ? selectedReportIDs : selectedTransactionReportIDs;
             const queryJSONToExport = isGroupExport && queryJSON ? addSelectedGroupsFilter(queryJSON, selectedTransactions, currentSearchResults?.data) : queryJSON;
-            const exactMatchFilterKeys = isGroupExport ? getGroupExportExactMatchFilterKeys(queryJSON?.groupBy) : undefined;
-            const exportParameters = getCSVExportParameters(isBasicExport, queryJSONToExport, exactMatchFilterKeys);
+            const exportParameters = getCSVExportParameters(isBasicExport, queryJSONToExport);
             await exportSearchItemsToCSV(
                 {
                     jsonQuery: exportParameters.jsonQuery,
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index ed2baaf18f2d..758042487167 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -860,12 +860,6 @@ function getQueryHashes(query: SearchQueryJSON) {
     }
 
     const filterSet = new Set<string>(orderedQuery);
-    const exactMatchFilterKeys = [...(query.exactMatchFilterKeys ?? [])].sort();
-    if (exactMatchFilterKeys.length > 0) {
-        const exactMatchIdentity = `exactMatch:${exactMatchFilterKeys.join(',')}`;
-        orderedQuery += ` ${exactMatchIdentity}`;
-        filterSet.add(exactMatchIdentity);
-    }
 
     // Certain filters shouldn't affect whether two searchers are similar or not, since they dont
     // actually filter out results
@@ -929,17 +923,6 @@ function getQueryHashes(query: SearchQueryJSON) {
     return {primaryHash, recentSearchHash, similarSearchHash};
 }
 
-function withExactMatchFilterKeys(queryJSON: Readonly<SearchQueryJSON>, exactMatchFilterKeys: SearchFilterKey[]): SearchQueryJSON {
-    const queryWithExactMatches = {...queryJSON, exactMatchFilterKeys};
-    const {primaryHash, recentSearchHash, similarSearchHash} = getQueryHashes(queryWithExactMatches);
-    return {
-        ...queryWithExactMatches,
-        hash: primaryHash,
-        recentSearchHash,
-        similarSearchHash,
-    };
-}
-
 /**
  * Returns whether a given string is a date preset (e.g. Last month)
  */
@@ -2912,18 +2895,16 @@ function isTextSearchField(key: string): key is SearchFilterKey {
  * Recursively traverses a search AST and replaces the `eq` operator with `contains`
  * for fields that still use partial matching on the backend (description).
  * Merchant is excluded because its parser output already distinguishes legacy contains from explicit exact matches.
- * Keys in `exactMatchFilterKeys` keep their original `eq` operator.
  */
-function applyContainsOperatorToTextFields(node: ASTNode, exactMatchFilterKeys?: ReadonlySet<SearchFilterKey>): ASTNode {
-    const filterKey = typeof node.left === 'string' && isTextSearchField(node.left) ? node.left : undefined;
-    if (filterKey && !exactMatchFilterKeys?.has(filterKey) && node.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO) {
+function applyContainsOperatorToTextFields(node: ASTNode): ASTNode {
+    if (typeof node.left === 'string' && isTextSearchField(node.left) && node.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO) {
         return {...node, operator: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS};
     }
 
     return {
         ...node,
-        left: typeof node.left === 'object' && node.left ? applyContainsOperatorToTextFields(node.left, exactMatchFilterKeys) : node.left,
-        right: typeof node.right === 'object' && !Array.isArray(node.right) && node.right ? applyContainsOperatorToTextFields(node.right, exactMatchFilterKeys) : node.right,
+        left: typeof node.left === 'object' && node.left ? applyContainsOperatorToTextFields(node.left) : node.left,
+        right: typeof node.right === 'object' && !Array.isArray(node.right) && node.right ? applyContainsOperatorToTextFields(node.right) : node.right,
     };
 }
 
@@ -2945,14 +2926,13 @@ function getDateModifierTitle(modifier: ValueOf<typeof CONST.SEARCH.DATE_MODIFIE
  * Serializes a query object to a JSON string for backend commands (Search, export, CSV).
  * Applies text-field operator normalization (`eq` → `contains`) for `description` so all backend
  * commands use consistent partial-match semantics, while preserving parsed merchant operators.
- * Keys in `exactMatchFilterKeys` keep exact-match semantics for generated filters.
  * Do NOT use for saving/persisting query definitions (e.g. saveSearch), where the original operators must be preserved.
  */
-function serializeQueryJSONForBackend<T extends {filters?: ASTNode | null; rawFilterList?: RawQueryFilter[]}>(queryData: T, exactMatchFilterKeys?: ReadonlySet<SearchFilterKey>): string {
-    const normalizedFilters = queryData.filters ? applyContainsOperatorToTextFields(queryData.filters, exactMatchFilterKeys) : queryData.filters;
+function serializeQueryJSONForBackend<T extends {filters?: ASTNode | null; rawFilterList?: RawQueryFilter[]}>(queryData: T): string {
+    const normalizedFilters = queryData.filters ? applyContainsOperatorToTextFields(queryData.filters) : queryData.filters;
     const normalizedRawFilterList = queryData.rawFilterList
         ? queryData.rawFilterList.map((filter) => {
-              if (isTextSearchField(filter.key) && !exactMatchFilterKeys?.has(filter.key) && filter.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO) {
+              if (isTextSearchField(filter.key) && filter.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO) {
                   return {...filter, operator: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS};
               }
               return filter;
@@ -3039,7 +3019,6 @@ export {
     getQueryHashes,
     hasFiltersChangedFromDefault,
     isSearchQuerySavable,
-    withExactMatchFilterKeys,
     isSearchDatePreset,
     getDateRangeForPreset,
     getDateFilterRange,
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 6548c70d0e4d..acfc6321667d 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -210,7 +210,6 @@ import {
     isSearchDatePreset,
     removeNegation,
     sortOptionsWithEmptyValue,
-    withExactMatchFilterKeys,
 } from './SearchQueryUtils';
 import {expenseStatusActionMapping, getSuggestedSearches, isEligibleForStatus, SEARCH_TYPE_MENU_ICON_NAMES} from './SearchSuggestionUtils';
 import StringUtils from './StringUtils';
@@ -3037,11 +3036,7 @@ function buildSpecificGroupQuery(queryJSON: SearchQueryJSON, filterKey: QueryFil
         sortOrder: CONST.SEARCH.SORT_ORDER.DESC,
         flatFilters: newFlatFilters,
     };
-    const specificGroupQueryJSON = buildSearchQueryJSON(buildSearchQueryString(newQueryJSON));
-    if (!specificGroupQueryJSON || filterKey !== CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT) {
-        return specificGroupQueryJSON;
-    }
-    return withExactMatchFilterKeys(specificGroupQueryJSON, [filterKey]);
+    return buildSearchQueryJSON(buildSearchQueryString(newQueryJSON));
 }
 
 function getActiveGroupSearchHashes(data: OnyxTypes.SearchResults['data'] | undefined, queryJSON: Readonly<SearchQueryJSON> | undefined): number[] {
diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts
index 862eedff7979..f7e2dcfcab2c 100644
--- a/src/libs/actions/Search.ts
+++ b/src/libs/actions/Search.ts
@@ -1230,7 +1230,7 @@ function handlePreventSearchAPI(hash: number | undefined) {
  * columns to a backend-supported date sort.
  */
 function getBackendQueryJSON(queryJSON: Readonly<SearchQueryJSON>) {
-    const {exactMatchFilterKeys, flatFilters, limit, ...queryJSONWithoutFlatFilters} = queryJSON;
+    const {flatFilters, limit, ...queryJSONWithoutFlatFilters} = queryJSON;
     const backendQueryJSON = shouldUseBackendDateSortFallback(queryJSON.sortBy)
         ? {
               ...queryJSONWithoutFlatFilters,
@@ -1244,7 +1244,7 @@ function getBackendQueryJSON(queryJSON: Readonly<SearchQueryJSON>) {
               ),
           }
         : queryJSONWithoutFlatFilters;
-    return {backendQueryJSON, limit, exactMatchFilterKeys};
+    return {backendQueryJSON, limit};
 }
 
 function search({
@@ -1325,7 +1325,7 @@ function search({
     inFlightSearchRequests.set(dedupeKey, inFlightRequestState);
 
     const onyxLoadingData = getOnyxLoadingData(queryJSON.hash, queryJSON, offset, true, shouldCalculateTotals, shouldShowLoading);
-    const {backendQueryJSON, limit, exactMatchFilterKeys} = getBackendQueryJSON(queryJSON);
+    const {backendQueryJSON, limit} = getBackendQueryJSON(queryJSON);
     const query = {
         ...backendQueryJSON,
         searchKey,
@@ -1336,7 +1336,7 @@ function search({
         // Backend expects 'maximumResults' instead of 'limit'
         ...(limit !== undefined && {maximumResults: limit}),
     };
-    const jsonQuery = serializeQueryJSONForBackend(query, exactMatchFilterKeys ? new Set(exactMatchFilterKeys) : undefined);
+    const jsonQuery = serializeQueryJSONForBackend(query);
 
     if (shouldUpdateLastSearchParams) {
         saveLastSearchParams({
@@ -1507,15 +1507,12 @@ function getFooterConvertedAmounts({
 
     // searchKey changes what the backend query matches (e.g. unapprovedCash excludes card expenses), so it must be
     // sent exactly as search() sends it or the converted totals cover a different expense set than the snapshot.
-    const {backendQueryJSON, exactMatchFilterKeys} = getBackendQueryJSON(queryJSON);
-    const jsonQuery = serializeQueryJSONForBackend(
-        {
-            ...backendQueryJSON,
-            searchKey,
-            filters: backendQueryJSON.filters ?? null,
-        },
-        exactMatchFilterKeys ? new Set(exactMatchFilterKeys) : undefined,
-    );
+    const {backendQueryJSON} = getBackendQueryJSON(queryJSON);
+    const jsonQuery = serializeQueryJSONForBackend({
+        ...backendQueryJSON,
+        searchKey,
+        filters: backendQueryJSON.filters ?? null,
+    });
 
     read(
         READ_COMMANDS.GET_TRANSACTIONS_CONVERTED_AMOUNT,
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index 2829ddf59454..16bb3d15b774 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -52,7 +52,6 @@ import {
     shouldResetSort,
     shouldResetSortForViewChange,
     sortOptionsWithEmptyValue,
-    withExactMatchFilterKeys,
 } from '@src/libs/SearchQueryUtils';
 import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -4586,42 +4585,21 @@ describe('SearchQueryUtils', () => {
             expect(serializeQueryJSONForBackend({filters: undefined, rawFilterList})).toBe(JSON.stringify({filters: undefined, rawFilterList: normalizedRawFilterList}));
         });
 
-        it('should preserve exact merchant matches in AST filters', () => {
-            const queryJSON = buildSearchQueryJSON('type:expense merchant=coffee');
+        it('should keep merchant eq and turn description eq into contains', () => {
+            // Given a query with an exact merchant list and a description filter, both parsed as `eq`
+            const queryJSON = buildSearchQueryJSON('type:expense merchant=Amazon,"Amazon Marketplace" description:order');
             if (!queryJSON) {
                 throw new Error('Expected queryJSON to be defined');
             }
-            const exactMatchFilterKeys = new Set<SearchFilterKey>([CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT]);
-            expect(serializeQueryJSONForBackend(queryJSON, exactMatchFilterKeys)).toBe(JSON.stringify(queryJSON));
-            const merchantNode = findNode(queryJSON.filters, 'merchant');
-            if (!merchantNode) {
-                throw new Error('Expected merchant node to be found in AST');
-            }
-            expect(merchantNode.operator).toBe(CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
-        });
 
-        it('should preserve exact merchant matches in rawFilterList', () => {
-            const rawFilterList = [{key: CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT, operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, value: 'coffee'}];
-            const exactMatchFilterKeys = new Set<SearchFilterKey>([CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT]);
-            expect(serializeQueryJSONForBackend({filters: undefined, rawFilterList}, exactMatchFilterKeys)).toBe(JSON.stringify({filters: undefined, rawFilterList}));
-        });
+            // When the query is serialized for the backend
+            const result = serializeQueryJSONForBackend(queryJSON);
 
-        it('should preserve multiple exact merchant matches while keeping description as contains', () => {
-            const queryJSON = buildSearchQueryJSON('type:expense merchant=Amazon,"Amazon Marketplace" description:order');
-            if (!queryJSON) {
-                throw new Error('Expected queryJSON to be defined');
-            }
-            const exactMatchFilterKeys = new Set<SearchFilterKey>([CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT]);
-            const normalizedFilters = applyContainsOperatorToTextFields(queryJSON.filters, exactMatchFilterKeys);
-            expect(serializeQueryJSONForBackend(queryJSON, exactMatchFilterKeys)).toBe(JSON.stringify({...queryJSON, filters: normalizedFilters}));
-            const merchantNode = findNode(normalizedFilters, 'merchant');
-            const descriptionNode = findNode(normalizedFilters, 'description');
-            if (!merchantNode || !descriptionNode) {
-                throw new Error('Expected merchant and description nodes to be found in AST');
-            }
-            expect(merchantNode.operator).toBe(CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
-            expect(merchantNode.right).toEqual(['Amazon', 'Amazon Marketplace']);
-            expect(descriptionNode.operator).toBe(CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
+            // Then merchant keeps exact matching, because the parser already tells `merchant=` from `merchant:`,
+            // and description still uses partial matching on the backend
+            expect(result).toContain('"operator":"eq","left":"merchant","right":["Amazon","Amazon Marketplace"]');
+            expect(result).toContain('"operator":"contains","left":"description","right":"order"');
+            expect(result).not.toContain('"operator":"contains","left":"merchant"');
         });
 
         it('should not affect non-text fields in rawFilterList', () => {
@@ -4630,22 +4608,6 @@ describe('SearchQueryUtils', () => {
         });
     });
 
-    describe('withExactMatchFilterKeys', () => {
-        it('should give exact queries distinct snapshot hashes', () => {
-            const partialQuery = buildSearchQueryJSON('type:expense merchant=Amazon');
-            if (!partialQuery) {
-                throw new Error('Expected partial query to be defined');
-            }
-
-            const exactQuery = withExactMatchFilterKeys(partialQuery, [CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT]);
-
-            expect(exactQuery.hash).not.toBe(partialQuery.hash);
-            expect(exactQuery.recentSearchHash).not.toBe(partialQuery.recentSearchHash);
-            expect(exactQuery.similarSearchHash).not.toBe(partialQuery.similarSearchHash);
-            expect(exactQuery.exactMatchFilterKeys).toEqual([CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT]);
-        });
-    });
-
     describe('getKeywordQueryWithCurrentSearchContext', () => {
         it('should prepend current search context to keyword-only input', () => {
             const currentQueryJSON = buildSearchQueryJSON('type:trip status:outstanding');
diff --git a/tests/unit/Search/SearchUIUtilsTest.ts b/tests/unit/Search/SearchUIUtilsTest.ts
index d3f192babb87..2d219c1b0085 100644
--- a/tests/unit/Search/SearchUIUtilsTest.ts
+++ b/tests/unit/Search/SearchUIUtilsTest.ts
@@ -18,7 +18,7 @@ import type {
 } from '@components/Search/SearchList/ListItem/types';
 import {GROUP_ITEM_TYPES} from '@components/Search/SearchList/ListItem/types';
 import {getExpenseHeaders} from '@components/Search/SearchTableHeader';
-import type {SearchColumnType, SearchFilterKey, SelectedTransactionInfo, SortOrder} from '@components/Search/types';
+import type {ASTNode, SearchColumnType, SearchFilterKey, SearchQueryJSON, SelectedTransactionInfo, SortOrder} from '@components/Search/types';
 
 import Navigation from '@navigation/Navigation';
 
@@ -5079,7 +5079,7 @@ describe('SearchUIUtils', () => {
             expect(emptyMerchantItem?.transactionsQueryJSON).toBeDefined();
             // The query should use 'none' (MERCHANT_EMPTY_VALUE) instead of empty string
             expect(emptyMerchantItem?.transactionsQueryJSON?.inputQuery).toContain(CONST.SEARCH.MERCHANT_EMPTY_VALUE);
-            expect(emptyMerchantItem?.transactionsQueryJSON?.exactMatchFilterKeys).toEqual([CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT]);
+            expect(emptyMerchantItem?.transactionsQueryJSON?.inputQuery).toContain(`merchant=${CONST.SEARCH.MERCHANT_EMPTY_VALUE}`);
         });
 
         it('should treat DEFAULT_MERCHANT "Expense" as empty merchant and display "No merchant"', () => {
@@ -7951,6 +7951,96 @@ describe('SearchUIUtils', () => {
         });
     });
 
+    describe('Merchant group exact match', () => {
+        function findFilterNode(node: ASTNode | null | undefined, key: string): ASTNode | undefined {
+            if (!node) {
+                return undefined;
+            }
+            if (node.left === key) {
+                return node;
+            }
+            const leftMatch = typeof node.left === 'object' ? findFilterNode(node.left, key) : undefined;
+            if (leftMatch) {
+                return leftMatch;
+            }
+            return typeof node.right === 'object' && !Array.isArray(node.right) ? findFilterNode(node.right, key) : undefined;
+        }
+
+        function getMerchantNode(queryJSON: SearchQueryJSON): ASTNode | undefined {
+            return findFilterNode(queryJSON.filters, CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT);
+        }
+
+        function getMerchantDrillDownQuery(merchant: string): SearchQueryJSON | undefined {
+            const [result] = getSectionsByType(
+                SearchUIUtils.getSections({
+                    dateFnsLocale: undefined,
+                    type: CONST.SEARCH.DATA_TYPES.EXPENSE,
+                    data: {
+                        personalDetailsList: {},
+                        [`${CONST.SEARCH.GROUP_PREFIX}777777777` as const]: {merchant, count: 1, currency: 'USD', total: 10},
+                    },
+                    currentAccountID: 2074551,
+                    currentUserEmail: '',
+                    translate: translateLocal,
+                    formatPhoneNumber,
+                    bankAccountList: {},
+                    rules: undefined,
+                    groupBy: CONST.SEARCH.GROUP_BY.MERCHANT,
+                    queryJSON: buildSearchQueryJSON('type:expense groupBy:merchant'),
+                    conciergeReportID: undefined,
+                    convertToDisplayString,
+                    reportAttributesDerivedValue: {},
+                }),
+                SearchUIUtils.isTransactionMerchantGroupListItemType,
+            );
+            return result.at(0)?.transactionsQueryJSON;
+        }
+
+        it('should send an exact merchant match when drilling down into a merchant group', () => {
+            // Given a merchant group "Amazon", where a contains match would also load "Amazon Marketplace" expenses
+            // When the sections build the drill-down query for that group
+            const drillDownQueryJSON = getMerchantDrillDownQuery('Amazon');
+            if (!drillDownQueryJSON) {
+                throw new Error('Expected the merchant drill-down query to be defined');
+            }
+
+            // Then the query uses the exact `merchant=` syntax and the backend receives it unchanged as `eq`,
+            // so only the group's own expenses load
+            expect(drillDownQueryJSON.inputQuery).toContain('merchant=Amazon');
+            expect(SearchQueryUtils.serializeQueryJSONForBackend(drillDownQueryJSON)).toBe(JSON.stringify(drillDownQueryJSON));
+            const merchantNode = getMerchantNode(drillDownQueryJSON);
+            expect(merchantNode?.operator).toBe(CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO);
+            expect(merchantNode?.right).toBe('Amazon');
+        });
+
+        it.each(['merchant:Amazon', 'merchant*:Amazon'])('should give the merchant drill-down query a different hash than the same search with %s', (containsFilter) => {
+            // Given the drill-down query of the "Amazon" group and the same search with a contains merchant filter
+            const drillDownQueryJSON = getMerchantDrillDownQuery('Amazon');
+            const containsQueryJSON = buildSearchQueryJSON(drillDownQueryJSON?.inputQuery.replace('merchant=Amazon', containsFilter) ?? '');
+
+            // When the two queries are compared
+            // Then their hashes differ, because `merchant=` already makes the query string differ, so the snapshots never share results
+            expect(containsQueryJSON?.inputQuery).toContain(containsFilter);
+            expect(drillDownQueryJSON?.hash).not.toBe(containsQueryJSON?.hash);
+            expect(drillDownQueryJSON?.recentSearchHash).not.toBe(containsQueryJSON?.recentSearchHash);
+        });
+
+        it('should give each selected merchant group a merchant filter entry with its own value', () => {
+            // Given the "Amazon" group and the "No merchant" group of a merchant-grouped search
+            const groups = [{merchant: 'Amazon'}, {merchant: ''}];
+
+            // When the export builds the filter entry for each selected group
+            const selectedGroupEntries = groups.map((group) => SearchUIUtils.getSelectedGroupFilterEntry(CONST.SEARCH.GROUP_BY.MERCHANT, group));
+
+            // Then each entry filters on merchant with the group's own value, and the empty merchant maps to `none`,
+            // so the export can match each group exactly. The hook test checks that the backend gets `eq`.
+            expect(selectedGroupEntries).toEqual([
+                {key: CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT, value: 'Amazon'},
+                {key: CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT, value: CONST.SEARCH.MERCHANT_EMPTY_VALUE},
+            ]);
+        });
+    });
+
     describe('Test getSortedSections', () => {
         it('should return getSortedReportActionData result when type is CHAT', () => {
             const sortedActions = getSortedSectionsByType(
diff --git a/tests/unit/hooks/useSearchBulkActionsTest.ts b/tests/unit/hooks/useSearchBulkActionsTest.ts
index 053ee015ff2d..4376cbdaaa92 100644
--- a/tests/unit/hooks/useSearchBulkActionsTest.ts
+++ b/tests/unit/hooks/useSearchBulkActionsTest.ts
@@ -5,7 +5,7 @@ import type {SearchQueryJSON, SelectedReports, SelectedTransactions} from '@comp
 
 import useSearchBulkActions from '@hooks/useSearchBulkActions';
 
-import {getExportTemplates, queueExportSearchItemsToCSV, queueExportSearchWithTemplate} from '@libs/actions/Search';
+import {exportSearchItemsToCSV, getExportTemplates, queueExportSearchItemsToCSV, queueExportSearchWithTemplate} from '@libs/actions/Search';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -14,6 +14,7 @@ import Onyx from 'react-native-onyx';
 
 const mockQueueExportSearchItemsToCSV = jest.mocked(queueExportSearchItemsToCSV);
 const mockQueueExportSearchWithTemplate = jest.mocked(queueExportSearchWithTemplate);
+const mockExportSearchItemsToCSV = jest.mocked(exportSearchItemsToCSV);
 const mockGetExportTemplates = jest.mocked(getExportTemplates);
 
 jest.mock('@libs/actions/Export', () => ({
@@ -328,6 +329,38 @@ describe('useSearchBulkActions - CSV export flow', () => {
         expect(exportPayload?.jsonQuery).not.toContain('group_123');
     });
 
+    it('exports a selected merchant group with an exact merchant match', async () => {
+        // Given a merchant-grouped search where the user ticked the "Amazon" group, so its loaded child is stamped with the group key
+        const merchantGroupKey = `${CONST.SEARCH.GROUP_PREFIX}123` as const;
+        mockSelectedTransactions = {tx1: makeSelectedTransaction({groupKey: merchantGroupKey, isSelectedViaGroup: true})};
+        mockCurrentSearchResults = {
+            search: {type: CONST.SEARCH.DATA_TYPES.EXPENSE},
+            data: {
+                [merchantGroupKey]: {merchant: 'Amazon', count: 3, total: 300, currency: 'USD'},
+            },
+        };
+
+        const {result} = renderHook(() => useSearchBulkActions({queryJSON: groupedExpenseQueryJSON}), {wrapper: OnyxListItemProvider});
+
+        await waitFor(() => {
+            expect(result.current.headerButtonsOptions.length).toBeGreaterThan(0);
+        });
+
+        // When the user exports the current view of that group selection
+        const onSelected = getExportMenuItems(result.current.headerButtonsOptions).find((item) => item.text === 'export.currentView')?.onSelected;
+
+        await act(async () => {
+            onSelected?.();
+        });
+
+        // Then the backend receives the merchant filter as `eq`, because a `contains` match on "Amazon" would also
+        // export "Amazon Marketplace" expenses that are not in the selected group
+        const [exportPayload] = mockExportSearchItemsToCSV.mock.calls.at(-1) ?? [];
+        expect(exportPayload?.isGroupExport).toBe(true);
+        expect(exportPayload?.jsonQuery).toContain(`"operator":"${CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO}","left":"${CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}","right":"Amazon"`);
+        expect(exportPayload?.jsonQuery).not.toContain(`"operator":"${CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS}"`);
+    });
+
     it('preserves excluded group negations when the query already filters the grouped field', async () => {
         const firstExcludedGroupKey = `${CONST.SEARCH.GROUP_PREFIX}123` as const;
         const secondExcludedGroupKey = `${CONST.SEARCH.GROUP_PREFIX}456` as const;

From 380f75dc1f9283d8ceaa8ca170251a38fceb33c1 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Wed, 7 Oct 2026 16:38:05 +0700
Subject: [PATCH 34/38] Extract buildMerchantFilterQuery from the filter query
 builder

Move the Merchant clause reconciliation out of the mappedFilters callback
in buildQueryStringFromFilterFormValues into a helper next to
getMerchantOperator. Query strings do not change.
---
 src/libs/SearchQueryUtils.ts | 82 +++++++++++++++++++++---------------
 1 file changed, 48 insertions(+), 34 deletions(-)

diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index 758042487167..8b44c821555c 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -110,6 +110,51 @@ function getMerchantOperator(operator: MerchantMatchType | undefined): MerchantM
     return operator ?? DEFAULT_MERCHANT_OPERATOR;
 }
 
+/**
+ * Builds the Merchant part of the query. The form has one Merchant field, so a changed condition updates every Merchant clause from flatFilters.
+ */
+function buildMerchantFilterQuery(
+    value: string,
+    prefix: string,
+    isNegated: boolean,
+    isMerchantNegated: boolean,
+    merchantOperator: MerchantMatchType | undefined,
+    flatFilters: QueryFilters | undefined,
+): string {
+    const merchantFilters = flatFilters?.filter((filter) => filter.key === FILTER_KEYS.MERCHANT) ?? [];
+    const positiveMerchantFilters = merchantFilters.filter((filter) => !filter.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO));
+    const negativeMerchantFilters = merchantFilters.filter((filter) => filter.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO));
+    const wasMerchantNegated = negativeMerchantFilters.length > 0;
+    const hasMerchantNegationChanged = wasMerchantNegated !== isMerchantNegated;
+    const lastVisibleMerchantFilter = (wasMerchantNegated ? negativeMerchantFilters : positiveMerchantFilters).at(-1);
+    const selectedMerchantOperator = getMerchantOperator(merchantOperator);
+    const originalMerchantFilters = isNegated ? negativeMerchantFilters : positiveMerchantFilters;
+    const lastMerchantFilter = hasMerchantNegationChanged ? lastVisibleMerchantFilter : originalMerchantFilters.at(-1);
+    const isMerchantValueUnchanged = value === lastMerchantFilter?.filters.map((item) => item.value.toString()).join(',');
+    if (lastMerchantFilter && isMerchantValueUnchanged) {
+        const currentMerchantOperator = positiveMerchantFilters.at(-1)?.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO)
+            ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO
+            : DEFAULT_MERCHANT_OPERATOR;
+        const hasMerchantOperatorChanged = !isMerchantNegated && selectedMerchantOperator !== currentMerchantOperator;
+        const hasMerchantConditionChanged = hasMerchantNegationChanged || hasMerchantOperatorChanged;
+        const filtersToUpdate = hasMerchantConditionChanged ? merchantFilters : originalMerchantFilters;
+        const updatedOperator = isNegated ? CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO : selectedMerchantOperator;
+        // The single field cannot represent every clause or distinguish lists from names containing commas.
+        const merchantClauses = filtersToUpdate.map((filter) => {
+            const clauseFilters = hasMerchantConditionChanged ? filter.filters.map((item) => ({...item, operator: updatedOperator})) : filter.filters;
+            return buildFilterValuesString(FILTER_KEYS.MERCHANT, clauseFilters).trim();
+        });
+        // Different operators can become identical clauses after the change.
+        return [...new Set(merchantClauses)].join(' ');
+    }
+
+    let operator: ValueOf<typeof operatorToCharMap> | typeof EXPLICIT_EQUAL_TO_OPERATOR = operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO];
+    if (!isNegated) {
+        operator = selectedMerchantOperator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO ? EXPLICIT_EQUAL_TO_OPERATOR : operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS];
+    }
+    return `${prefix}${CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT}${operator}${sanitizeSearchValue(value)}`;
+}
+
 // Pre-computed validation Sets for buildFilterFormValuesFromQuery (avoids recreating per filter iteration)
 const VALID_EXPENSE_TYPES = new Set(Object.values(CONST.SEARCH.TRANSACTION_TYPE));
 const VALID_RECEIPT_TYPES = new Set<string>(Object.values(CONST.SEARCH.RECEIPT_TYPE));
@@ -1269,42 +1314,11 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
             ) {
                 const keyInCorrectForm = (Object.keys(CONST.SEARCH.SYNTAX_FILTER_KEYS) as FilterKeys[]).find((key) => CONST.SEARCH.SYNTAX_FILTER_KEYS[key] === filterKey);
                 if (keyInCorrectForm) {
-                    let operator: ValueOf<typeof operatorToCharMap> | typeof EXPLICIT_EQUAL_TO_OPERATOR = operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO];
+                    const value = filterValue as string;
                     if (filterKey === FILTER_KEYS.MERCHANT) {
-                        const merchantFilters = options?.flatFilters?.filter((filter) => filter.key === FILTER_KEYS.MERCHANT) ?? [];
-                        const positiveMerchantFilters = merchantFilters.filter((filter) => !filter.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO));
-                        const negativeMerchantFilters = merchantFilters.filter((filter) => filter.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO));
-                        const wasMerchantNegated = negativeMerchantFilters.length > 0;
-                        const isMerchantNegated = !!supportedFilterValues.merchantNot;
-                        const hasMerchantNegationChanged = wasMerchantNegated !== isMerchantNegated;
-                        const lastVisibleMerchantFilter = (wasMerchantNegated ? negativeMerchantFilters : positiveMerchantFilters).at(-1);
-                        const selectedMerchantOperator = getMerchantOperator(merchantOperator);
-                        const originalMerchantFilters = isNegated ? negativeMerchantFilters : positiveMerchantFilters;
-                        const lastMerchantFilter = hasMerchantNegationChanged ? lastVisibleMerchantFilter : originalMerchantFilters.at(-1);
-                        const isMerchantValueUnchanged = filterValue === lastMerchantFilter?.filters.map((item) => item.value.toString()).join(',');
-                        if (lastMerchantFilter && isMerchantValueUnchanged) {
-                            const currentMerchantOperator = positiveMerchantFilters.at(-1)?.filters.some((item) => item.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO)
-                                ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO
-                                : DEFAULT_MERCHANT_OPERATOR;
-                            const hasMerchantOperatorChanged = !isMerchantNegated && selectedMerchantOperator !== currentMerchantOperator;
-                            const hasMerchantConditionChanged = hasMerchantNegationChanged || hasMerchantOperatorChanged;
-                            const filtersToUpdate = hasMerchantConditionChanged ? merchantFilters : originalMerchantFilters;
-                            const updatedOperator = isNegated ? CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO : selectedMerchantOperator;
-                            // The single field cannot represent every clause or distinguish lists from names containing commas.
-                            const merchantClauses = filtersToUpdate.map((filter) => {
-                                const clauseFilters = hasMerchantConditionChanged ? filter.filters.map((item) => ({...item, operator: updatedOperator})) : filter.filters;
-                                return buildFilterValuesString(FILTER_KEYS.MERCHANT, clauseFilters).trim();
-                            });
-                            // Different operators can become identical clauses after the change.
-                            return [...new Set(merchantClauses)].join(' ');
-                        }
-
-                        if (!isNegated) {
-                            operator =
-                                selectedMerchantOperator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO ? EXPLICIT_EQUAL_TO_OPERATOR : operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS];
-                        }
+                        return buildMerchantFilterQuery(value, prefix, isNegated, !!supportedFilterValues.merchantNot, merchantOperator, options?.flatFilters);
                     }
-                    return `${prefix}${CONST.SEARCH.SYNTAX_FILTER_KEYS[keyInCorrectForm]}${operator}${sanitizeSearchValue(filterValue as string)}`;
+                    return `${prefix}${CONST.SEARCH.SYNTAX_FILTER_KEYS[keyInCorrectForm]}${operatorToCharMap[CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO]}${sanitizeSearchValue(value)}`;
                 }
             }
             if ((filterKey === FILTER_KEYS.REPORT_ID || filterKey === FILTER_KEYS.WITHDRAWAL_ID) && filterValue) {

From afdf3706ced68edb4ffd5dc6594a9e1e4353655d Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Wed, 7 Oct 2026 17:03:03 +0700
Subject: [PATCH 35/38] Reuse TextInputFilterContent for the Merchant filter

MerchantFilterContent forked TextInputFilterContent without its ScrollView
and in-list button handling. Add an optional, generic renderBelowInput slot
(plus buttonStyles and sentryLabel) to TextInputFilterContent, and make
MerchantFilterContent a thin wrapper that passes the match type selector
through the slot.

Reserve the row height of the match type list, because a flex list inside
a ScrollView can shrink to zero height when the keyboard is open.
---
 .../AdvancedFilters/MerchantFilterContent.tsx | 111 ++++++------------
 .../TextInputFilterContent.tsx                |  26 +++-
 .../MerchantMatchTypeSelector.tsx             |  17 ++-
 3 files changed, 67 insertions(+), 87 deletions(-)

diff --git a/src/components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent.tsx
index 3a646817e684..badf05abfa88 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/MerchantFilterContent.tsx
@@ -1,29 +1,22 @@
 /**
  * Renders the advanced Merchant filter input, match type, and negation controls.
  */
-import Button from '@components/Button';
 import MerchantMatchTypeSelector from '@components/Search/FilterComponents/MerchantMatchTypeSelector';
-import NegatableFilter from '@components/Search/FilterComponents/NegatableFilter';
-import useTextFilterValidation from '@components/Search/hooks/useTextFilterValidation';
-import TextInput from '@components/TextInput';
-import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
 
-import useAutoFocusInput from '@hooks/useAutoFocusInput';
-import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {FILTER_VIEW_MAP} from '@libs/SearchUIUtils';
-
 import CONST from '@src/CONST';
 import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
 import type {MerchantMatchType, SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
 
-import type {TextInput as RNTextInput, StyleProp, ViewStyle} from 'react-native';
+import type {StyleProp, ViewStyle} from 'react-native';
 import type {ValueOf} from 'type-fest';
 
 import React, {useState} from 'react';
 import {View} from 'react-native';
 
+import TextInputFilterContent from './TextInputFilterContent';
+
 type MerchantFilterContentProps = {
     /** The Merchant filter key. */
     baseFilterKey: typeof CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT;
@@ -59,14 +52,10 @@ type MerchantFilterContentProps = {
     onChange: (values: Partial<SearchAdvancedFiltersForm>) => void;
 };
 
-function isTextInput(element: BaseTextInputRef | RNTextInput | null): element is RNTextInput {
-    return !!element && 'isFocused' in element;
-}
-
 function MerchantFilterContent({
     baseFilterKey,
-    value: initialValue,
-    isNegated: initialIsNegated,
+    value,
+    isNegated,
     merchantOperator: initialMerchantOperator,
     buttonSize,
     buttonText,
@@ -76,76 +65,42 @@ function MerchantFilterContent({
     buttonStyles,
     onChange,
 }: MerchantFilterContentProps) {
-    const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const [value, setValue] = useState(initialValue);
-    const [isNegated, setIsNegated] = useState(initialIsNegated);
     const [merchantOperator, setMerchantOperator] = useState<MerchantMatchType>(initialMerchantOperator ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS);
-    const shouldShowMerchantMatchType = !isNegated;
-    const label = translate(FILTER_VIEW_MAP[baseFilterKey].labelKey);
-    const {inputCallbackRef} = useAutoFocusInput();
-    const error = useTextFilterValidation(baseFilterKey, value);
-
-    const filterInput = (
-        <TextInput
-            ref={(ref) => {
-                if (!autoFocus || !isTextInput(ref)) {
-                    return;
-                }
-                inputCallbackRef(ref);
-            }}
-            placeholder={label}
-            value={value}
-            errorText={error}
-            hasError={!!error}
-            onChangeText={setValue}
-            accessibilityLabel={label}
-            role={CONST.ROLE.PRESENTATION}
-            containerStyles={shouldShowMerchantMatchType ? [styles.ph5, styles.mb5] : [styles.ph5]}
-        />
-    );
-
-    const updateMerchantFilter = () => {
-        if (error) {
-            return;
-        }
 
+    const updateMerchantFilter = (newValue: string | undefined, newIsNegated: boolean) => {
         onChange({
-            [FILTER_KEYS.MERCHANT]: isNegated ? undefined : value,
-            [FILTER_KEYS.MERCHANT_NOT]: isNegated ? value : undefined,
-            [FILTER_KEYS.MERCHANT_OPERATOR]: isNegated ? undefined : merchantOperator,
+            [FILTER_KEYS.MERCHANT]: newIsNegated ? undefined : newValue,
+            [FILTER_KEYS.MERCHANT_NOT]: newIsNegated ? newValue : undefined,
+            [FILTER_KEYS.MERCHANT_OPERATOR]: newIsNegated ? undefined : merchantOperator,
         });
     };
 
+    // A negated Merchant filter always uses the not-equal operator, so the match type is hidden.
+    const renderMatchTypeSelector = (isFilterNegated: boolean) =>
+        isFilterNegated ? null : (
+            <View style={[styles.flex1, styles.mt2]}>
+                <MerchantMatchTypeSelector
+                    value={merchantOperator}
+                    onChange={setMerchantOperator}
+                />
+            </View>
+        );
+
     return (
-        <View style={[styles.flex1, styles.justifyContentBetween, style]}>
-            <NegatableFilter
-                baseFilterKey={baseFilterKey}
-                isNegated={isNegated}
-                onNegationChange={setIsNegated}
-                style={shouldShowMerchantMatchType ? styles.flex1 : undefined}
-            >
-                <View style={shouldShowMerchantMatchType ? styles.flex1 : undefined}>
-                    {filterInput}
-                    {shouldShowMerchantMatchType && (
-                        <MerchantMatchTypeSelector
-                            value={merchantOperator}
-                            onChange={setMerchantOperator}
-                        />
-                    )}
-                </View>
-            </NegatableFilter>
-            <Button
-                style={[styles.ph5, styles.pb5, buttonStyles]}
-                variant={CONST.BUTTON_VARIANT.SUCCESS}
-                size={buttonSize}
-                onPress={updateMerchantFilter}
-                sentryLabel={sentryLabel}
-            >
-                <Button.KeyboardShortcut />
-                <Button.Text>{buttonText ?? translate('common.confirm')}</Button.Text>
-            </Button>
-        </View>
+        <TextInputFilterContent
+            baseFilterKey={baseFilterKey}
+            value={value}
+            isNegated={isNegated}
+            size={buttonSize}
+            autoFocus={autoFocus}
+            style={style}
+            buttonText={buttonText}
+            buttonStyles={buttonStyles}
+            sentryLabel={sentryLabel}
+            renderBelowInput={renderMatchTypeSelector}
+            onChange={updateMerchantFilter}
+        />
     );
 }
 
diff --git a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
index 6242f00b45ae..077606301b62 100644
--- a/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
+++ b/src/components/Search/FilterComponents/AdvancedFilters/TextInputFilterContent.tsx
@@ -15,7 +15,7 @@ import {FILTER_VIEW_MAP} from '@libs/SearchUIUtils';
 
 import CONST from '@src/CONST';
 
-import type {ComponentRef} from 'react';
+import type {ComponentRef, ReactNode} from 'react';
 import type {TextInput as RNTextInput, StyleProp, ViewStyle} from 'react-native';
 import type {ValueOf} from 'type-fest';
 
@@ -30,6 +30,12 @@ type TextInputFilterContentProps = {
     autoFocus?: boolean;
     style?: StyleProp<ViewStyle>;
     buttonText?: string;
+    buttonStyles?: StyleProp<ViewStyle>;
+    sentryLabel?: string;
+
+    /** Renders extra controls under the input, inside the scrollable area. Receives the current negation state, so the content can change when the user negates the filter. */
+    renderBelowInput?: (isNegated: boolean) => ReactNode;
+
     onChange: (value: string | undefined, isNegated: boolean) => void;
 };
 
@@ -37,7 +43,19 @@ function isTextInput(element: BaseTextInputRef | ComponentRef<typeof RNTextInput
     return !!element && 'isFocused' in element;
 }
 
-function TextInputFilterContent({baseFilterKey, value: initialValue, isNegated: initialIsNegated, autoFocus, size, style, buttonText, onChange}: TextInputFilterContentProps) {
+function TextInputFilterContent({
+    baseFilterKey,
+    value: initialValue,
+    isNegated: initialIsNegated,
+    autoFocus,
+    size,
+    style,
+    buttonText,
+    buttonStyles,
+    sentryLabel,
+    renderBelowInput,
+    onChange,
+}: TextInputFilterContentProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const [value, setValue] = useState(initialValue);
@@ -50,7 +68,7 @@ function TextInputFilterContent({baseFilterKey, value: initialValue, isNegated:
 
     const button = (
         <Button
-            style={[styles.ph5, styles.pb5]}
+            style={[styles.ph5, styles.pb5, buttonStyles]}
             variant={CONST.BUTTON_VARIANT.SUCCESS}
             size={size}
             onPress={() => {
@@ -59,6 +77,7 @@ function TextInputFilterContent({baseFilterKey, value: initialValue, isNegated:
                 }
                 onChange(value, isNegated);
             }}
+            sentryLabel={sentryLabel}
         >
             <Button.KeyboardShortcut />
             <Button.Text>{buttonText ?? translate('common.confirm')}</Button.Text>
@@ -93,6 +112,7 @@ function TextInputFilterContent({baseFilterKey, value: initialValue, isNegated:
                         containerStyles={[styles.ph5]}
                     />
                 </NegatableFilter>
+                {renderBelowInput?.(isNegated)}
                 {shouldButtonBeInScrollView && button}
             </ScrollView>
             {!shouldButtonBeInScrollView && button}
diff --git a/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx b/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx
index 4cf7cf356cb3..cbcf743be352 100644
--- a/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx
+++ b/src/components/Search/FilterComponents/MerchantMatchTypeSelector.tsx
@@ -9,6 +9,8 @@ import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import variables from '@styles/variables';
+
 import CONST from '@src/CONST';
 import type {MerchantMatchType} from '@src/types/form/SearchAdvancedFiltersForm';
 
@@ -44,12 +46,15 @@ function MerchantMatchTypeSelector({value, onChange}: MerchantMatchTypeSelectorP
             <View style={[styles.pb2, styles.ph5]}>
                 <Text style={[styles.textLabelSupporting]}>{translate('search.filters.merchant.matchType')}</Text>
             </View>
-            <SelectionList
-                data={items}
-                ListItem={SingleSelectListItem}
-                onSelectRow={(item) => onChange(item.keyForList)}
-                shouldSingleExecuteRowSelect
-            />
+            {/* Inside a ScrollView a flex list can shrink to zero height when the keyboard is open, so reserve room for every row */}
+            <View style={[styles.flex1, {minHeight: items.length * variables.optionRowHeight}]}>
+                <SelectionList
+                    data={items}
+                    ListItem={SingleSelectListItem}
+                    onSelectRow={(item) => onChange(item.keyForList)}
+                    shouldSingleExecuteRowSelect
+                />
+            </View>
         </>
     );
 }

From 93596d722a8995f995559910839368f74cd95d00 Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Wed, 7 Oct 2026 17:18:08 +0700
Subject: [PATCH 36/38] Load the English locale in SearchSavePageTest

The Merchant filter value is now shown through translate as
Contains "Coffee Shop". The test loaded no locale, so translate returned
key paths and the Merchant text never rendered. Load English before the
tests and assert the localized label users see.
---
 tests/unit/pages/Search/SearchSavePageTest.tsx | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tests/unit/pages/Search/SearchSavePageTest.tsx b/tests/unit/pages/Search/SearchSavePageTest.tsx
index 9ca581247845..258c06a1d59e 100644
--- a/tests/unit/pages/Search/SearchSavePageTest.tsx
+++ b/tests/unit/pages/Search/SearchSavePageTest.tsx
@@ -11,6 +11,7 @@ import * as SearchUIUtils from '@libs/SearchUIUtils';
 import SearchSavePage from '@pages/Search/SearchSavePage';
 
 import CONST from '@src/CONST';
+import IntlStore from '@src/languages/IntlStore';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {SearchAdvancedFiltersForm} from '@src/types/form';
 import type {Card, CardList} from '@src/types/onyx';
@@ -53,16 +54,24 @@ jest.mocked(useOnyx).mockImplementation((key) => {
             return [undefined, {status: 'loaded'}];
     }
 });
+// Without a loaded locale, translate returns key paths and translated filter values never show the user's text.
+beforeAll(() => IntlStore.load(CONST.LOCALES.EN));
 beforeEach(() => jest.clearAllMocks());
 it.each([[['12']], [['12', '23']], [['123']]])('renders canonical card selection %j exactly', (cardID) => {
+    // Given a saved search form with cards, feeds, tax rates and a Merchant filter that uses the default "contains" match
     form = {cardID, feed: ['feed-a', 'feed-b'], taxRate: ['tax-a', 'tax-b'], merchant: 'Coffee Shop'};
+
+    // When the save page renders the filter summary
     const output = JSON.stringify(render(<SearchSavePage />).toJSON());
+
+    // Then only the selected card titles, the feed and tax display values, and the localized Merchant label show
     const expectedDescriptions = cardID.at(0) === '123' ? [false, false, true] : [true, cardID.length === 2, false];
     expect(['Selected Alpha', 'Selected Beta', 'Unselected Overlap'].map((text) => output.includes(text))).toEqual(expectedDescriptions);
     expect(['12', '23', '123'].map((rawID) => output.includes(rawID))).toEqual([false, false, false]);
     expect(jest.mocked(useFilterFeedValue)).toHaveBeenCalledWith(['feed-a', 'feed-b']);
     expect(jest.mocked(useFilterTaxRateValue)).toHaveBeenCalledWith(['tax-a', 'tax-b']);
-    expect(['feed:feed-a|feed-b', 'tax:tax-a|tax-b', 'Coffee Shop'].every((text) => output.includes(text))).toBe(true);
+    // The output is a JSON string, so the quotes in the Merchant label are escaped.
+    expect(['feed:feed-a|feed-b', 'tax:tax-a|tax-b', 'Contains \\"Coffee Shop\\"'].every((text) => output.includes(text))).toBe(true);
 });
 it('renders scalar feed and tax values without calling array display hooks', () => {
     jest.spyOn(SearchUIUtils, 'mapFiltersFormToLabelValueList').mockReturnValueOnce([

From 58f320b9920b51c638929bb48c3606b0f69e7aaf Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Thu, 8 Oct 2026 10:32:05 +0700
Subject: [PATCH 37/38] Render SearchColumnsPage inside OnyxListItemProvider in
 its test

After the main merge, SearchColumnsPage reads the session through
usePolicyForMovingExpenses, which needs OnyxListItemProvider. Wrap the
render in the provider and return the form only for its own Onyx key.
---
 tests/ui/SearchColumnsPageTest.tsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/ui/SearchColumnsPageTest.tsx b/tests/ui/SearchColumnsPageTest.tsx
index d64d732eb229..5c8b96f9eaea 100644
--- a/tests/ui/SearchColumnsPageTest.tsx
+++ b/tests/ui/SearchColumnsPageTest.tsx
@@ -1,6 +1,7 @@
 import {fireEvent, render, screen} from '@testing-library/react-native';
 
 import type ColumnsSettingsList from '@components/ColumnsSettingsList';
+import OnyxListItemProvider from '@components/OnyxListItemProvider';
 import MockText from '@components/Text';
 
 import useOnyx from '@hooks/useOnyx';
@@ -9,6 +10,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import {buildFilterFormValuesFromQuery, buildSearchQueryJSON} from '@libs/SearchQueryUtils';
 
 import NAVIGATORS from '@src/NAVIGATORS';
+import ONYXKEYS from '@src/ONYXKEYS';
 import SearchColumnsPage from '@src/pages/Search/SearchColumnsPage';
 import SCREENS from '@src/SCREENS';
 
@@ -36,12 +38,16 @@ describe('SearchColumnsPage', () => {
         }
 
         const form = buildFilterFormValuesFromQuery(queryJSON, {}, {}, {}, {}, {}, {});
-        (jest.mocked(useOnyx) as jest.Mock).mockReturnValue([form]);
+        (jest.mocked(useOnyx) as jest.Mock).mockImplementation((key: string) => [key === ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM ? form : undefined]);
         mockGetRootState.mockReturnValue({
             routes: [{name: NAVIGATORS.TAB_NAVIGATOR, params: {screen: NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, params: {screen: SCREENS.SEARCH.ROOT, params: {q: input}}}}],
         });
 
-        render(<SearchColumnsPage />);
+        render(
+            <OnyxListItemProvider>
+                <SearchColumnsPage />
+            </OnyxListItemProvider>,
+        );
         fireEvent.press(screen.getByText('Save columns'));
 
         const [route] = jest.mocked(Navigation.navigate).mock.calls.at(-1) ?? [];

From 125ca02caed859fca7ddb4691e2fb5d0dfc21efe Mon Sep 17 00:00:00 2001
From: Phuoc Hiep <zendragon93@gmail.com>
Date: Wed, 14 Oct 2026 10:21:21 +0700
Subject: [PATCH 38/38] Update main's Spend footer tests for the merchant
 contains operator

---
 tests/unit/Search/SearchQueryUtilsTest.ts | 3 ++-
 tests/unit/SearchParserTest.ts            | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index f856517af60a..f94025165124 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -2791,7 +2791,8 @@ describe('SearchQueryUtils', () => {
             // Captured before the footer keys existed. These hashes key saved searches and snapshots, so they must not drift.
             expect(buildSearchQueryJSON('type:expense')?.hash).toEqual(959171759);
             expect(buildSearchQueryJSON('type:expense-report')?.hash).toEqual(1657503970);
-            expect(buildSearchQueryJSON('type:expense merchant:Amazon')?.hash).toEqual(1692688529);
+            // `merchant:` parses as contains and hashes as `merchant*:`, so this hash differs from the one before the match type existed.
+            expect(buildSearchQueryJSON('type:expense merchant:Amazon')?.hash).toEqual(1712664595);
         });
     });
 
diff --git a/tests/unit/SearchParserTest.ts b/tests/unit/SearchParserTest.ts
index 5b3f0ed2e5cc..96b4cdc35431 100644
--- a/tests/unit/SearchParserTest.ts
+++ b/tests/unit/SearchParserTest.ts
@@ -1711,7 +1711,7 @@ const footerSelectionTests = [
                     right: 'USD',
                 },
                 right: {
-                    operator: 'eq',
+                    operator: 'contains',
                     left: 'merchant',
                     right: 'Amazon',
                 },