From d506ecec85631a4c0aae1b88e8d6f55f3011d415 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 13 Aug 2025 12:03:23 -0600
Subject: [PATCH 1/2] support report-id

---
 src/CONST/index.ts                          |   2 +-
 src/libs/SearchParser/autocompleteParser.js | 549 ++++++++++----------
 src/libs/SearchParser/baseRules.peggy       |   2 +-
 src/libs/SearchParser/searchParser.js       | 549 ++++++++++----------
 src/libs/SearchQueryUtils.ts                |   3 +-
 5 files changed, 563 insertions(+), 542 deletions(-)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index ea6ae8176303..0e914f236afd 100755
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -6463,7 +6463,7 @@ const CONST = {
             TAX_RATE: 'tax-rate',
             CARD_ID: 'card',
             FEED: 'feed',
-            REPORT_ID: 'reportid',
+            REPORT_ID: 'report-id',
             KEYWORD: 'keyword',
             IN: 'in',
             SUBMITTED: 'submitted',
diff --git a/src/libs/SearchParser/autocompleteParser.js b/src/libs/SearchParser/autocompleteParser.js
index 1943d351ae97..b04b10aed5b2 100644
--- a/src/libs/SearchParser/autocompleteParser.js
+++ b/src/libs/SearchParser/autocompleteParser.js
@@ -189,55 +189,56 @@ function peg$parse(input, options) {
   var peg$c3 = "merchant";
   var peg$c4 = "description";
   var peg$c5 = "reportid";
-  var peg$c6 = "keyword";
-  var peg$c7 = "in";
-  var peg$c8 = "currency";
-  var peg$c9 = "tag";
-  var peg$c10 = "category";
-  var peg$c11 = "to";
-  var peg$c12 = "exporter";
-  var peg$c13 = "payer";
-  var peg$c14 = "taxrate";
-  var peg$c15 = "tax-rate";
-  var peg$c16 = "cardID";
-  var peg$c17 = "card";
-  var peg$c18 = "from";
-  var peg$c19 = "expenseType";
-  var peg$c20 = "expense-type";
-  var peg$c21 = "withdrawalType";
-  var peg$c22 = "withdrawal-type";
-  var peg$c23 = "billable";
-  var peg$c24 = "reimbursable";
-  var peg$c25 = "type";
-  var peg$c26 = "status";
-  var peg$c27 = "sortBy";
-  var peg$c28 = "sort-by";
-  var peg$c29 = "sortOrder";
-  var peg$c30 = "sort-order";
-  var peg$c31 = "policyID";
-  var peg$c32 = "workspace";
-  var peg$c33 = "submitted";
-  var peg$c34 = "approved";
-  var peg$c35 = "paid";
-  var peg$c36 = "exported";
-  var peg$c37 = "posted";
-  var peg$c38 = "withdrawn";
-  var peg$c39 = "groupby";
-  var peg$c40 = "group-by";
-  var peg$c41 = "feed";
-  var peg$c42 = "title";
-  var peg$c43 = "assignee";
-  var peg$c44 = "createdby";
-  var peg$c45 = "created-by";
-  var peg$c46 = "action";
-  var peg$c47 = "!=";
-  var peg$c48 = ">=";
-  var peg$c49 = ">";
-  var peg$c50 = "<=";
-  var peg$c51 = "<";
-  var peg$c52 = "\u201C";
-  var peg$c53 = "\u201D";
-  var peg$c54 = "\"";
+  var peg$c6 = "report-id";
+  var peg$c7 = "keyword";
+  var peg$c8 = "in";
+  var peg$c9 = "currency";
+  var peg$c10 = "tag";
+  var peg$c11 = "category";
+  var peg$c12 = "to";
+  var peg$c13 = "exporter";
+  var peg$c14 = "payer";
+  var peg$c15 = "taxrate";
+  var peg$c16 = "tax-rate";
+  var peg$c17 = "cardID";
+  var peg$c18 = "card";
+  var peg$c19 = "from";
+  var peg$c20 = "expenseType";
+  var peg$c21 = "expense-type";
+  var peg$c22 = "withdrawalType";
+  var peg$c23 = "withdrawal-type";
+  var peg$c24 = "billable";
+  var peg$c25 = "reimbursable";
+  var peg$c26 = "type";
+  var peg$c27 = "status";
+  var peg$c28 = "sortBy";
+  var peg$c29 = "sort-by";
+  var peg$c30 = "sortOrder";
+  var peg$c31 = "sort-order";
+  var peg$c32 = "policyID";
+  var peg$c33 = "workspace";
+  var peg$c34 = "submitted";
+  var peg$c35 = "approved";
+  var peg$c36 = "paid";
+  var peg$c37 = "exported";
+  var peg$c38 = "posted";
+  var peg$c39 = "withdrawn";
+  var peg$c40 = "groupby";
+  var peg$c41 = "group-by";
+  var peg$c42 = "feed";
+  var peg$c43 = "title";
+  var peg$c44 = "assignee";
+  var peg$c45 = "createdby";
+  var peg$c46 = "created-by";
+  var peg$c47 = "action";
+  var peg$c48 = "!=";
+  var peg$c49 = ">=";
+  var peg$c50 = ">";
+  var peg$c51 = "<=";
+  var peg$c52 = "<";
+  var peg$c53 = "\u201C";
+  var peg$c54 = "\u201D";
+  var peg$c55 = "\"";
 
   var peg$r0 = /^[:=]/;
   var peg$r1 = /^[^ ,\t\n\r\xA0]/;
@@ -258,71 +259,72 @@ function peg$parse(input, options) {
   var peg$e4 = peg$literalExpectation("merchant", true);
   var peg$e5 = peg$literalExpectation("description", true);
   var peg$e6 = peg$literalExpectation("reportid", true);
-  var peg$e7 = peg$literalExpectation("keyword", true);
-  var peg$e8 = peg$literalExpectation("in", true);
-  var peg$e9 = peg$literalExpectation("currency", true);
-  var peg$e10 = peg$literalExpectation("tag", true);
-  var peg$e11 = peg$literalExpectation("category", true);
-  var peg$e12 = peg$literalExpectation("to", true);
-  var peg$e13 = peg$literalExpectation("exporter", true);
-  var peg$e14 = peg$literalExpectation("payer", true);
-  var peg$e15 = peg$literalExpectation("taxRate", true);
-  var peg$e16 = peg$literalExpectation("tax-rate", true);
-  var peg$e17 = peg$literalExpectation("cardID", false);
-  var peg$e18 = peg$literalExpectation("card", true);
-  var peg$e19 = peg$literalExpectation("from", true);
-  var peg$e20 = peg$literalExpectation("expenseType", false);
-  var peg$e21 = peg$literalExpectation("expense-type", true);
-  var peg$e22 = peg$literalExpectation("withdrawalType", false);
-  var peg$e23 = peg$literalExpectation("withdrawal-type", true);
-  var peg$e24 = peg$literalExpectation("billable", true);
-  var peg$e25 = peg$literalExpectation("reimbursable", true);
-  var peg$e26 = peg$literalExpectation("type", true);
-  var peg$e27 = peg$literalExpectation("status", true);
-  var peg$e28 = peg$literalExpectation("sortBy", false);
-  var peg$e29 = peg$literalExpectation("sort-by", true);
-  var peg$e30 = peg$literalExpectation("sortOrder", false);
-  var peg$e31 = peg$literalExpectation("sort-order", true);
-  var peg$e32 = peg$literalExpectation("policyID", false);
-  var peg$e33 = peg$literalExpectation("workspace", true);
-  var peg$e34 = peg$literalExpectation("submitted", true);
-  var peg$e35 = peg$literalExpectation("approved", true);
-  var peg$e36 = peg$literalExpectation("paid", true);
-  var peg$e37 = peg$literalExpectation("exported", true);
-  var peg$e38 = peg$literalExpectation("posted", true);
-  var peg$e39 = peg$literalExpectation("withdrawn", true);
-  var peg$e40 = peg$literalExpectation("groupBy", true);
-  var peg$e41 = peg$literalExpectation("group-by", true);
-  var peg$e42 = peg$literalExpectation("feed", true);
-  var peg$e43 = peg$literalExpectation("title", true);
-  var peg$e44 = peg$literalExpectation("assignee", true);
-  var peg$e45 = peg$literalExpectation("createdBy", true);
-  var peg$e46 = peg$literalExpectation("created-by", true);
-  var peg$e47 = peg$literalExpectation("action", true);
-  var peg$e48 = peg$otherExpectation("operator");
-  var peg$e49 = peg$classExpectation([":", "="], false, false);
-  var peg$e50 = peg$literalExpectation("!=", false);
-  var peg$e51 = peg$literalExpectation(">=", false);
-  var peg$e52 = peg$literalExpectation(">", false);
-  var peg$e53 = peg$literalExpectation("<=", false);
-  var peg$e54 = peg$literalExpectation("<", false);
-  var peg$e55 = peg$otherExpectation("word");
-  var peg$e56 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e57 = peg$otherExpectation("whitespace");
-  var peg$e58 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
-  var peg$e59 = peg$otherExpectation("quote");
-  var peg$e60 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e61 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
-  var peg$e62 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
-  var peg$e63 = peg$literalExpectation("\u201C", false);
-  var peg$e64 = peg$literalExpectation("\u201D", false);
-  var peg$e65 = peg$literalExpectation("\"", false);
-  var peg$e66 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e67 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e68 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
-  var peg$e69 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
-  var peg$e70 = peg$anyExpectation();
-  var peg$e71 = peg$classExpectation([","], false, false);
+  var peg$e7 = peg$literalExpectation("report-id", true);
+  var peg$e8 = peg$literalExpectation("keyword", true);
+  var peg$e9 = peg$literalExpectation("in", true);
+  var peg$e10 = peg$literalExpectation("currency", true);
+  var peg$e11 = peg$literalExpectation("tag", true);
+  var peg$e12 = peg$literalExpectation("category", true);
+  var peg$e13 = peg$literalExpectation("to", true);
+  var peg$e14 = peg$literalExpectation("exporter", true);
+  var peg$e15 = peg$literalExpectation("payer", true);
+  var peg$e16 = peg$literalExpectation("taxRate", true);
+  var peg$e17 = peg$literalExpectation("tax-rate", true);
+  var peg$e18 = peg$literalExpectation("cardID", false);
+  var peg$e19 = peg$literalExpectation("card", true);
+  var peg$e20 = peg$literalExpectation("from", true);
+  var peg$e21 = peg$literalExpectation("expenseType", false);
+  var peg$e22 = peg$literalExpectation("expense-type", true);
+  var peg$e23 = peg$literalExpectation("withdrawalType", false);
+  var peg$e24 = peg$literalExpectation("withdrawal-type", true);
+  var peg$e25 = peg$literalExpectation("billable", true);
+  var peg$e26 = peg$literalExpectation("reimbursable", true);
+  var peg$e27 = peg$literalExpectation("type", true);
+  var peg$e28 = peg$literalExpectation("status", true);
+  var peg$e29 = peg$literalExpectation("sortBy", false);
+  var peg$e30 = peg$literalExpectation("sort-by", true);
+  var peg$e31 = peg$literalExpectation("sortOrder", false);
+  var peg$e32 = peg$literalExpectation("sort-order", true);
+  var peg$e33 = peg$literalExpectation("policyID", false);
+  var peg$e34 = peg$literalExpectation("workspace", true);
+  var peg$e35 = peg$literalExpectation("submitted", true);
+  var peg$e36 = peg$literalExpectation("approved", true);
+  var peg$e37 = peg$literalExpectation("paid", true);
+  var peg$e38 = peg$literalExpectation("exported", true);
+  var peg$e39 = peg$literalExpectation("posted", true);
+  var peg$e40 = peg$literalExpectation("withdrawn", true);
+  var peg$e41 = peg$literalExpectation("groupBy", true);
+  var peg$e42 = peg$literalExpectation("group-by", true);
+  var peg$e43 = peg$literalExpectation("feed", true);
+  var peg$e44 = peg$literalExpectation("title", true);
+  var peg$e45 = peg$literalExpectation("assignee", true);
+  var peg$e46 = peg$literalExpectation("createdBy", true);
+  var peg$e47 = peg$literalExpectation("created-by", true);
+  var peg$e48 = peg$literalExpectation("action", true);
+  var peg$e49 = peg$otherExpectation("operator");
+  var peg$e50 = peg$classExpectation([":", "="], false, false);
+  var peg$e51 = peg$literalExpectation("!=", false);
+  var peg$e52 = peg$literalExpectation(">=", false);
+  var peg$e53 = peg$literalExpectation(">", false);
+  var peg$e54 = peg$literalExpectation("<=", false);
+  var peg$e55 = peg$literalExpectation("<", false);
+  var peg$e56 = peg$otherExpectation("word");
+  var peg$e57 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e58 = peg$otherExpectation("whitespace");
+  var peg$e59 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
+  var peg$e60 = peg$otherExpectation("quote");
+  var peg$e61 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e62 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
+  var peg$e63 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
+  var peg$e64 = peg$literalExpectation("\u201C", false);
+  var peg$e65 = peg$literalExpectation("\u201D", false);
+  var peg$e66 = peg$literalExpectation("\"", false);
+  var peg$e67 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e68 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e69 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
+  var peg$e70 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
+  var peg$e71 = peg$anyExpectation();
+  var peg$e72 = peg$classExpectation([","], false, false);
 
   var peg$f0 = function(ranges) { return { autocomplete, ranges }; };
   var peg$f1 = function(filters) { return filters.filter(Boolean).flat(); };
@@ -964,19 +966,28 @@ function peg$parse(input, options) {
   function peg$parsereportID() {
     var s0, s1;
 
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c5) {
+    s0 = input.substr(peg$currPos, 8);
+    if (s0.toLowerCase() === peg$c5) {
       peg$currPos += 8;
     } else {
-      s1 = peg$FAILED;
+      s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e6); }
     }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f10();
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 9);
+      if (s1.toLowerCase() === peg$c6) {
+        peg$currPos += 9;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e7); }
+      }
+      if (s1 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s1 = peg$f10();
+      }
+      s0 = s1;
     }
-    s0 = s1;
 
     return s0;
   }
@@ -986,11 +997,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 7);
-    if (s1.toLowerCase() === peg$c6) {
+    if (s1.toLowerCase() === peg$c7) {
       peg$currPos += 7;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e7); }
+      if (peg$silentFails === 0) { peg$fail(peg$e8); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1006,11 +1017,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
-    if (s1.toLowerCase() === peg$c7) {
+    if (s1.toLowerCase() === peg$c8) {
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e8); }
+      if (peg$silentFails === 0) { peg$fail(peg$e9); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1026,11 +1037,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c8) {
+    if (s1.toLowerCase() === peg$c9) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e9); }
+      if (peg$silentFails === 0) { peg$fail(peg$e10); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1046,11 +1057,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c9) {
+    if (s1.toLowerCase() === peg$c10) {
       peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e10); }
+      if (peg$silentFails === 0) { peg$fail(peg$e11); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1066,11 +1077,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c10) {
+    if (s1.toLowerCase() === peg$c11) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e11); }
+      if (peg$silentFails === 0) { peg$fail(peg$e12); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1086,11 +1097,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
-    if (s1.toLowerCase() === peg$c11) {
+    if (s1.toLowerCase() === peg$c12) {
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e12); }
+      if (peg$silentFails === 0) { peg$fail(peg$e13); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1106,11 +1117,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c12) {
+    if (s1.toLowerCase() === peg$c13) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e13); }
+      if (peg$silentFails === 0) { peg$fail(peg$e14); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1126,11 +1137,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c13) {
+    if (s1.toLowerCase() === peg$c14) {
       peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e14); }
+      if (peg$silentFails === 0) { peg$fail(peg$e15); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1145,20 +1156,20 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
-    if (s0.toLowerCase() === peg$c14) {
+    if (s0.toLowerCase() === peg$c15) {
       peg$currPos += 7;
     } 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, 8);
-      if (s1.toLowerCase() === peg$c15) {
+      if (s1.toLowerCase() === peg$c16) {
         peg$currPos += 8;
       } 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;
@@ -1173,21 +1184,21 @@ function peg$parse(input, options) {
   function peg$parsecardID() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 6) === peg$c16) {
-      s0 = peg$c16;
+    if (input.substr(peg$currPos, 6) === peg$c17) {
+      s0 = peg$c17;
       peg$currPos += 6;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e17); }
+      if (peg$silentFails === 0) { peg$fail(peg$e18); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 4);
-      if (s1.toLowerCase() === peg$c17) {
+      if (s1.toLowerCase() === peg$c18) {
         peg$currPos += 4;
       } 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;
@@ -1204,11 +1215,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c18) {
+    if (s1.toLowerCase() === peg$c19) {
       peg$currPos += 4;
     } 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;
@@ -1222,21 +1233,21 @@ function peg$parse(input, options) {
   function peg$parseexpenseType() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 11) === peg$c19) {
-      s0 = peg$c19;
+    if (input.substr(peg$currPos, 11) === peg$c20) {
+      s0 = peg$c20;
       peg$currPos += 11;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e20); }
+      if (peg$silentFails === 0) { peg$fail(peg$e21); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 12);
-      if (s1.toLowerCase() === peg$c20) {
+      if (s1.toLowerCase() === peg$c21) {
         peg$currPos += 12;
       } 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;
@@ -1251,21 +1262,21 @@ function peg$parse(input, options) {
   function peg$parsewithdrawalType() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 14) === peg$c21) {
-      s0 = peg$c21;
+    if (input.substr(peg$currPos, 14) === peg$c22) {
+      s0 = peg$c22;
       peg$currPos += 14;
     } 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, 15);
-      if (s1.toLowerCase() === peg$c22) {
+      if (s1.toLowerCase() === peg$c23) {
         peg$currPos += 15;
       } 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;
@@ -1282,11 +1293,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c23) {
+    if (s1.toLowerCase() === peg$c24) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e24); }
+      if (peg$silentFails === 0) { peg$fail(peg$e25); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1302,11 +1313,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
-    if (s1.toLowerCase() === peg$c24) {
+    if (s1.toLowerCase() === peg$c25) {
       peg$currPos += 12;
     } 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;
@@ -1322,11 +1333,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c25) {
+    if (s1.toLowerCase() === peg$c26) {
       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;
@@ -1342,11 +1353,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c26) {
+    if (s1.toLowerCase() === peg$c27) {
       peg$currPos += 6;
     } 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;
@@ -1360,21 +1371,21 @@ function peg$parse(input, options) {
   function peg$parsesortBy() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 6) === peg$c27) {
-      s0 = peg$c27;
+    if (input.substr(peg$currPos, 6) === peg$c28) {
+      s0 = peg$c28;
       peg$currPos += 6;
     } 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, 7);
-      if (s1.toLowerCase() === peg$c28) {
+      if (s1.toLowerCase() === peg$c29) {
         peg$currPos += 7;
       } 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;
@@ -1389,21 +1400,21 @@ function peg$parse(input, options) {
   function peg$parsesortOrder() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 9) === peg$c29) {
-      s0 = peg$c29;
+    if (input.substr(peg$currPos, 9) === peg$c30) {
+      s0 = peg$c30;
       peg$currPos += 9;
     } 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, 10);
-      if (s1.toLowerCase() === peg$c30) {
+      if (s1.toLowerCase() === peg$c31) {
         peg$currPos += 10;
       } 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;
@@ -1418,21 +1429,21 @@ function peg$parse(input, options) {
   function peg$parsepolicyID() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 8) === peg$c31) {
-      s0 = peg$c31;
+    if (input.substr(peg$currPos, 8) === peg$c32) {
+      s0 = peg$c32;
       peg$currPos += 8;
     } 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, 9);
-      if (s1.toLowerCase() === peg$c32) {
+      if (s1.toLowerCase() === peg$c33) {
         peg$currPos += 9;
       } 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;
@@ -1449,11 +1460,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c33) {
+    if (s1.toLowerCase() === peg$c34) {
       peg$currPos += 9;
     } 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;
@@ -1469,11 +1480,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c34) {
+    if (s1.toLowerCase() === peg$c35) {
       peg$currPos += 8;
     } 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;
@@ -1489,11 +1500,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c35) {
+    if (s1.toLowerCase() === peg$c36) {
       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;
@@ -1509,11 +1520,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c36) {
+    if (s1.toLowerCase() === peg$c37) {
       peg$currPos += 8;
     } 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;
@@ -1529,11 +1540,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c37) {
+    if (s1.toLowerCase() === peg$c38) {
       peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e38); }
+      if (peg$silentFails === 0) { peg$fail(peg$e39); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1549,11 +1560,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c38) {
+    if (s1.toLowerCase() === peg$c39) {
       peg$currPos += 9;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e39); }
+      if (peg$silentFails === 0) { peg$fail(peg$e40); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1568,20 +1579,20 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
-    if (s0.toLowerCase() === peg$c39) {
+    if (s0.toLowerCase() === peg$c40) {
       peg$currPos += 7;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e40); }
+      if (peg$silentFails === 0) { peg$fail(peg$e41); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
-      if (s1.toLowerCase() === peg$c40) {
+      if (s1.toLowerCase() === peg$c41) {
         peg$currPos += 8;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e41); }
+        if (peg$silentFails === 0) { peg$fail(peg$e42); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
@@ -1598,11 +1609,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c41) {
+    if (s1.toLowerCase() === peg$c42) {
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e42); }
+      if (peg$silentFails === 0) { peg$fail(peg$e43); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1618,11 +1629,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c42) {
+    if (s1.toLowerCase() === peg$c43) {
       peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e43); }
+      if (peg$silentFails === 0) { peg$fail(peg$e44); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1638,11 +1649,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c43) {
+    if (s1.toLowerCase() === peg$c44) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e44); }
+      if (peg$silentFails === 0) { peg$fail(peg$e45); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1657,20 +1668,20 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 9);
-    if (s0.toLowerCase() === peg$c44) {
+    if (s0.toLowerCase() === peg$c45) {
       peg$currPos += 9;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e45); }
+      if (peg$silentFails === 0) { peg$fail(peg$e46); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 10);
-      if (s1.toLowerCase() === peg$c45) {
+      if (s1.toLowerCase() === peg$c46) {
         peg$currPos += 10;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e46); }
+        if (peg$silentFails === 0) { peg$fail(peg$e47); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
@@ -1687,11 +1698,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c46) {
+    if (s1.toLowerCase() === peg$c47) {
       peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e47); }
+      if (peg$silentFails === 0) { peg$fail(peg$e48); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1712,7 +1723,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e49); }
+      if (peg$silentFails === 0) { peg$fail(peg$e50); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1721,12 +1732,12 @@ function peg$parse(input, options) {
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c47) {
-        s1 = peg$c47;
+      if (input.substr(peg$currPos, 2) === peg$c48) {
+        s1 = peg$c48;
         peg$currPos += 2;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e50); }
+        if (peg$silentFails === 0) { peg$fail(peg$e51); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
@@ -1735,12 +1746,12 @@ function peg$parse(input, options) {
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 2) === peg$c48) {
-          s1 = peg$c48;
+        if (input.substr(peg$currPos, 2) === peg$c49) {
+          s1 = peg$c49;
           peg$currPos += 2;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e51); }
+          if (peg$silentFails === 0) { peg$fail(peg$e52); }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
@@ -1750,11 +1761,11 @@ function peg$parse(input, options) {
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
           if (input.charCodeAt(peg$currPos) === 62) {
-            s1 = peg$c49;
+            s1 = peg$c50;
             peg$currPos++;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e52); }
+            if (peg$silentFails === 0) { peg$fail(peg$e53); }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
@@ -1763,12 +1774,12 @@ function peg$parse(input, options) {
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 2) === peg$c50) {
-              s1 = peg$c50;
+            if (input.substr(peg$currPos, 2) === peg$c51) {
+              s1 = peg$c51;
               peg$currPos += 2;
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e53); }
+              if (peg$silentFails === 0) { peg$fail(peg$e54); }
             }
             if (s1 !== peg$FAILED) {
               peg$savedPos = s0;
@@ -1778,11 +1789,11 @@ function peg$parse(input, options) {
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
               if (input.charCodeAt(peg$currPos) === 60) {
-                s1 = peg$c51;
+                s1 = peg$c52;
                 peg$currPos++;
               } else {
                 s1 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e54); }
+                if (peg$silentFails === 0) { peg$fail(peg$e55); }
               }
               if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
@@ -1797,7 +1808,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e48); }
+      if (peg$silentFails === 0) { peg$fail(peg$e49); }
     }
 
     return s0;
@@ -1828,7 +1839,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e56); }
+      if (peg$silentFails === 0) { peg$fail(peg$e57); }
     }
     if (s2 !== peg$FAILED) {
       while (s2 !== peg$FAILED) {
@@ -1838,7 +1849,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e56); }
+          if (peg$silentFails === 0) { peg$fail(peg$e57); }
         }
       }
     } else {
@@ -1852,7 +1863,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e55); }
+      if (peg$silentFails === 0) { peg$fail(peg$e56); }
     }
 
     return s0;
@@ -1880,7 +1891,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e58); }
+      if (peg$silentFails === 0) { peg$fail(peg$e59); }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
@@ -1889,12 +1900,12 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e58); }
+        if (peg$silentFails === 0) { peg$fail(peg$e59); }
       }
     }
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e57); }
+    if (peg$silentFails === 0) { peg$fail(peg$e58); }
 
     return s0;
   }
@@ -1941,7 +1952,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e60); }
+      if (peg$silentFails === 0) { peg$fail(peg$e61); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -1950,7 +1961,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e60); }
+        if (peg$silentFails === 0) { peg$fail(peg$e61); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -1958,7 +1969,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e61); }
+      if (peg$silentFails === 0) { peg$fail(peg$e62); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -1967,7 +1978,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e62); }
+        if (peg$silentFails === 0) { peg$fail(peg$e63); }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
@@ -1976,7 +1987,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e62); }
+          if (peg$silentFails === 0) { peg$fail(peg$e63); }
         }
       }
       s4 = input.charAt(peg$currPos);
@@ -1984,7 +1995,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e61); }
+        if (peg$silentFails === 0) { peg$fail(peg$e62); }
       }
       if (s4 !== peg$FAILED) {
         s5 = [];
@@ -1993,7 +2004,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e56); }
+          if (peg$silentFails === 0) { peg$fail(peg$e57); }
         }
         while (s6 !== peg$FAILED) {
           s5.push(s6);
@@ -2002,7 +2013,7 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e56); }
+            if (peg$silentFails === 0) { peg$fail(peg$e57); }
           }
         }
         peg$savedPos = s0;
@@ -2018,7 +2029,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e59); }
+      if (peg$silentFails === 0) { peg$fail(peg$e60); }
     }
 
     return s0;
@@ -2035,7 +2046,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e60); }
+      if (peg$silentFails === 0) { peg$fail(peg$e61); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -2044,7 +2055,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e60); }
+        if (peg$silentFails === 0) { peg$fail(peg$e61); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -2052,7 +2063,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e61); }
+      if (peg$silentFails === 0) { peg$fail(peg$e62); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -2061,7 +2072,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e62); }
+        if (peg$silentFails === 0) { peg$fail(peg$e63); }
       }
       if (s4 === peg$FAILED) {
         s4 = peg$currPos;
@@ -2077,11 +2088,11 @@ function peg$parse(input, options) {
         }
         if (s5 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 8220) {
-            s6 = peg$c52;
+            s6 = peg$c53;
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e63); }
+            if (peg$silentFails === 0) { peg$fail(peg$e64); }
           }
           if (s6 !== peg$FAILED) {
             peg$savedPos = s4;
@@ -2108,11 +2119,11 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8221) {
-              s6 = peg$c53;
+              s6 = peg$c54;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e64); }
+              if (peg$silentFails === 0) { peg$fail(peg$e65); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
@@ -2139,11 +2150,11 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 34) {
-                s6 = peg$c54;
+                s6 = peg$c55;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e65); }
+                if (peg$silentFails === 0) { peg$fail(peg$e66); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
@@ -2166,7 +2177,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e62); }
+          if (peg$silentFails === 0) { peg$fail(peg$e63); }
         }
         if (s4 === peg$FAILED) {
           s4 = peg$currPos;
@@ -2182,11 +2193,11 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8220) {
-              s6 = peg$c52;
+              s6 = peg$c53;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e63); }
+              if (peg$silentFails === 0) { peg$fail(peg$e64); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
@@ -2213,11 +2224,11 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 8221) {
-                s6 = peg$c53;
+                s6 = peg$c54;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e64); }
+                if (peg$silentFails === 0) { peg$fail(peg$e65); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
@@ -2244,11 +2255,11 @@ function peg$parse(input, options) {
               }
               if (s5 !== peg$FAILED) {
                 if (input.charCodeAt(peg$currPos) === 34) {
-                  s6 = peg$c54;
+                  s6 = peg$c55;
                   peg$currPos++;
                 } else {
                   s6 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e65); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e66); }
                 }
                 if (s6 !== peg$FAILED) {
                   peg$savedPos = s4;
@@ -2280,7 +2291,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e59); }
+      if (peg$silentFails === 0) { peg$fail(peg$e60); }
     }
 
     return s0;
@@ -2295,7 +2306,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e61); }
+      if (peg$silentFails === 0) { peg$fail(peg$e62); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -2333,7 +2344,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e66); }
+      if (peg$silentFails === 0) { peg$fail(peg$e67); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -2342,7 +2353,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e66); }
+        if (peg$silentFails === 0) { peg$fail(peg$e67); }
       }
     }
     s2 = [];
@@ -2351,7 +2362,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s3 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e67); }
+      if (peg$silentFails === 0) { peg$fail(peg$e68); }
     }
     while (s3 !== peg$FAILED) {
       s2.push(s3);
@@ -2360,7 +2371,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e67); }
+        if (peg$silentFails === 0) { peg$fail(peg$e68); }
       }
     }
     s3 = [];
@@ -2369,7 +2380,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s4 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e68); }
+      if (peg$silentFails === 0) { peg$fail(peg$e69); }
     }
     while (s4 !== peg$FAILED) {
       s3.push(s4);
@@ -2378,7 +2389,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e68); }
+        if (peg$silentFails === 0) { peg$fail(peg$e69); }
       }
     }
     s4 = peg$parseoperator();
@@ -2397,7 +2408,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e69); }
+        if (peg$silentFails === 0) { peg$fail(peg$e70); }
       }
       while (s2 !== peg$FAILED) {
         s1.push(s2);
@@ -2406,7 +2417,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e69); }
+          if (peg$silentFails === 0) { peg$fail(peg$e70); }
         }
       }
       s2 = peg$currPos;
@@ -2427,7 +2438,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e70); }
+          if (peg$silentFails === 0) { peg$fail(peg$e71); }
         }
         peg$silentFails--;
         if (s4 === peg$FAILED) {
@@ -2453,7 +2464,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e71); }
+          if (peg$silentFails === 0) { peg$fail(peg$e72); }
         }
       }
     }
diff --git a/src/libs/SearchParser/baseRules.peggy b/src/libs/SearchParser/baseRules.peggy
index 31d7e573796d..dbb1764915f1 100644
--- a/src/libs/SearchParser/baseRules.peggy
+++ b/src/libs/SearchParser/baseRules.peggy
@@ -19,7 +19,7 @@ date = "date"i { return "date"; }
 amount = "amount"i { return "amount"; }
 merchant = "merchant"i { return "merchant"; }
 description = "description"i { return "description"; }
-reportID = "reportid"i { return "reportID"; }
+reportID = "reportid"i / "report-id"i { return "reportID"; }
 keyword = "keyword"i { return "keyword"; }
 in = "in"i { return "in"; }
 currency = "currency"i { return "currency"; }
diff --git a/src/libs/SearchParser/searchParser.js b/src/libs/SearchParser/searchParser.js
index 7be15ccd7a34..6a32e2c05979 100644
--- a/src/libs/SearchParser/searchParser.js
+++ b/src/libs/SearchParser/searchParser.js
@@ -190,55 +190,56 @@ function peg$parse(input, options) {
   var peg$c3 = "merchant";
   var peg$c4 = "description";
   var peg$c5 = "reportid";
-  var peg$c6 = "keyword";
-  var peg$c7 = "in";
-  var peg$c8 = "currency";
-  var peg$c9 = "tag";
-  var peg$c10 = "category";
-  var peg$c11 = "to";
-  var peg$c12 = "exporter";
-  var peg$c13 = "payer";
-  var peg$c14 = "taxrate";
-  var peg$c15 = "tax-rate";
-  var peg$c16 = "cardID";
-  var peg$c17 = "card";
-  var peg$c18 = "from";
-  var peg$c19 = "expenseType";
-  var peg$c20 = "expense-type";
-  var peg$c21 = "withdrawalType";
-  var peg$c22 = "withdrawal-type";
-  var peg$c23 = "billable";
-  var peg$c24 = "reimbursable";
-  var peg$c25 = "type";
-  var peg$c26 = "status";
-  var peg$c27 = "sortBy";
-  var peg$c28 = "sort-by";
-  var peg$c29 = "sortOrder";
-  var peg$c30 = "sort-order";
-  var peg$c31 = "policyID";
-  var peg$c32 = "workspace";
-  var peg$c33 = "submitted";
-  var peg$c34 = "approved";
-  var peg$c35 = "paid";
-  var peg$c36 = "exported";
-  var peg$c37 = "posted";
-  var peg$c38 = "withdrawn";
-  var peg$c39 = "groupby";
-  var peg$c40 = "group-by";
-  var peg$c41 = "feed";
-  var peg$c42 = "title";
-  var peg$c43 = "assignee";
-  var peg$c44 = "createdby";
-  var peg$c45 = "created-by";
-  var peg$c46 = "action";
-  var peg$c47 = "!=";
-  var peg$c48 = ">=";
-  var peg$c49 = ">";
-  var peg$c50 = "<=";
-  var peg$c51 = "<";
-  var peg$c52 = "\u201C";
-  var peg$c53 = "\u201D";
-  var peg$c54 = "\"";
+  var peg$c6 = "report-id";
+  var peg$c7 = "keyword";
+  var peg$c8 = "in";
+  var peg$c9 = "currency";
+  var peg$c10 = "tag";
+  var peg$c11 = "category";
+  var peg$c12 = "to";
+  var peg$c13 = "exporter";
+  var peg$c14 = "payer";
+  var peg$c15 = "taxrate";
+  var peg$c16 = "tax-rate";
+  var peg$c17 = "cardID";
+  var peg$c18 = "card";
+  var peg$c19 = "from";
+  var peg$c20 = "expenseType";
+  var peg$c21 = "expense-type";
+  var peg$c22 = "withdrawalType";
+  var peg$c23 = "withdrawal-type";
+  var peg$c24 = "billable";
+  var peg$c25 = "reimbursable";
+  var peg$c26 = "type";
+  var peg$c27 = "status";
+  var peg$c28 = "sortBy";
+  var peg$c29 = "sort-by";
+  var peg$c30 = "sortOrder";
+  var peg$c31 = "sort-order";
+  var peg$c32 = "policyID";
+  var peg$c33 = "workspace";
+  var peg$c34 = "submitted";
+  var peg$c35 = "approved";
+  var peg$c36 = "paid";
+  var peg$c37 = "exported";
+  var peg$c38 = "posted";
+  var peg$c39 = "withdrawn";
+  var peg$c40 = "groupby";
+  var peg$c41 = "group-by";
+  var peg$c42 = "feed";
+  var peg$c43 = "title";
+  var peg$c44 = "assignee";
+  var peg$c45 = "createdby";
+  var peg$c46 = "created-by";
+  var peg$c47 = "action";
+  var peg$c48 = "!=";
+  var peg$c49 = ">=";
+  var peg$c50 = ">";
+  var peg$c51 = "<=";
+  var peg$c52 = "<";
+  var peg$c53 = "\u201C";
+  var peg$c54 = "\u201D";
+  var peg$c55 = "\"";
 
   var peg$r0 = /^[^ \t\r\n\xA0]/;
   var peg$r1 = /^[:=]/;
@@ -262,71 +263,72 @@ function peg$parse(input, options) {
   var peg$e6 = peg$literalExpectation("merchant", true);
   var peg$e7 = peg$literalExpectation("description", true);
   var peg$e8 = peg$literalExpectation("reportid", true);
-  var peg$e9 = peg$literalExpectation("keyword", true);
-  var peg$e10 = peg$literalExpectation("in", true);
-  var peg$e11 = peg$literalExpectation("currency", true);
-  var peg$e12 = peg$literalExpectation("tag", true);
-  var peg$e13 = peg$literalExpectation("category", true);
-  var peg$e14 = peg$literalExpectation("to", true);
-  var peg$e15 = peg$literalExpectation("exporter", true);
-  var peg$e16 = peg$literalExpectation("payer", true);
-  var peg$e17 = peg$literalExpectation("taxRate", true);
-  var peg$e18 = peg$literalExpectation("tax-rate", true);
-  var peg$e19 = peg$literalExpectation("cardID", false);
-  var peg$e20 = peg$literalExpectation("card", true);
-  var peg$e21 = peg$literalExpectation("from", true);
-  var peg$e22 = peg$literalExpectation("expenseType", false);
-  var peg$e23 = peg$literalExpectation("expense-type", true);
-  var peg$e24 = peg$literalExpectation("withdrawalType", false);
-  var peg$e25 = peg$literalExpectation("withdrawal-type", true);
-  var peg$e26 = peg$literalExpectation("billable", true);
-  var peg$e27 = peg$literalExpectation("reimbursable", true);
-  var peg$e28 = peg$literalExpectation("type", true);
-  var peg$e29 = peg$literalExpectation("status", true);
-  var peg$e30 = peg$literalExpectation("sortBy", false);
-  var peg$e31 = peg$literalExpectation("sort-by", true);
-  var peg$e32 = peg$literalExpectation("sortOrder", false);
-  var peg$e33 = peg$literalExpectation("sort-order", true);
-  var peg$e34 = peg$literalExpectation("policyID", false);
-  var peg$e35 = peg$literalExpectation("workspace", true);
-  var peg$e36 = peg$literalExpectation("submitted", true);
-  var peg$e37 = peg$literalExpectation("approved", true);
-  var peg$e38 = peg$literalExpectation("paid", true);
-  var peg$e39 = peg$literalExpectation("exported", true);
-  var peg$e40 = peg$literalExpectation("posted", true);
-  var peg$e41 = peg$literalExpectation("withdrawn", true);
-  var peg$e42 = peg$literalExpectation("groupBy", true);
-  var peg$e43 = peg$literalExpectation("group-by", true);
-  var peg$e44 = peg$literalExpectation("feed", true);
-  var peg$e45 = peg$literalExpectation("title", true);
-  var peg$e46 = peg$literalExpectation("assignee", true);
-  var peg$e47 = peg$literalExpectation("createdBy", true);
-  var peg$e48 = peg$literalExpectation("created-by", true);
-  var peg$e49 = peg$literalExpectation("action", true);
-  var peg$e50 = peg$otherExpectation("operator");
-  var peg$e51 = peg$classExpectation([":", "="], false, false);
-  var peg$e52 = peg$literalExpectation("!=", false);
-  var peg$e53 = peg$literalExpectation(">=", false);
-  var peg$e54 = peg$literalExpectation(">", false);
-  var peg$e55 = peg$literalExpectation("<=", false);
-  var peg$e56 = peg$literalExpectation("<", false);
-  var peg$e57 = peg$otherExpectation("word");
-  var peg$e58 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e59 = peg$otherExpectation("whitespace");
-  var peg$e60 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
-  var peg$e61 = peg$otherExpectation("quote");
-  var peg$e62 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e63 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
-  var peg$e64 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
-  var peg$e65 = peg$literalExpectation("\u201C", false);
-  var peg$e66 = peg$literalExpectation("\u201D", false);
-  var peg$e67 = peg$literalExpectation("\"", false);
-  var peg$e68 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e69 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e70 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
-  var peg$e71 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
-  var peg$e72 = peg$anyExpectation();
-  var peg$e73 = peg$classExpectation([","], false, false);
+  var peg$e9 = peg$literalExpectation("report-id", true);
+  var peg$e10 = peg$literalExpectation("keyword", true);
+  var peg$e11 = peg$literalExpectation("in", true);
+  var peg$e12 = peg$literalExpectation("currency", true);
+  var peg$e13 = peg$literalExpectation("tag", true);
+  var peg$e14 = peg$literalExpectation("category", true);
+  var peg$e15 = peg$literalExpectation("to", true);
+  var peg$e16 = peg$literalExpectation("exporter", true);
+  var peg$e17 = peg$literalExpectation("payer", true);
+  var peg$e18 = peg$literalExpectation("taxRate", true);
+  var peg$e19 = peg$literalExpectation("tax-rate", true);
+  var peg$e20 = peg$literalExpectation("cardID", false);
+  var peg$e21 = peg$literalExpectation("card", true);
+  var peg$e22 = peg$literalExpectation("from", true);
+  var peg$e23 = peg$literalExpectation("expenseType", false);
+  var peg$e24 = peg$literalExpectation("expense-type", true);
+  var peg$e25 = peg$literalExpectation("withdrawalType", false);
+  var peg$e26 = peg$literalExpectation("withdrawal-type", true);
+  var peg$e27 = peg$literalExpectation("billable", true);
+  var peg$e28 = peg$literalExpectation("reimbursable", true);
+  var peg$e29 = peg$literalExpectation("type", true);
+  var peg$e30 = peg$literalExpectation("status", true);
+  var peg$e31 = peg$literalExpectation("sortBy", false);
+  var peg$e32 = peg$literalExpectation("sort-by", true);
+  var peg$e33 = peg$literalExpectation("sortOrder", false);
+  var peg$e34 = peg$literalExpectation("sort-order", true);
+  var peg$e35 = peg$literalExpectation("policyID", false);
+  var peg$e36 = peg$literalExpectation("workspace", true);
+  var peg$e37 = peg$literalExpectation("submitted", true);
+  var peg$e38 = peg$literalExpectation("approved", true);
+  var peg$e39 = peg$literalExpectation("paid", true);
+  var peg$e40 = peg$literalExpectation("exported", true);
+  var peg$e41 = peg$literalExpectation("posted", true);
+  var peg$e42 = peg$literalExpectation("withdrawn", true);
+  var peg$e43 = peg$literalExpectation("groupBy", true);
+  var peg$e44 = peg$literalExpectation("group-by", true);
+  var peg$e45 = peg$literalExpectation("feed", true);
+  var peg$e46 = peg$literalExpectation("title", true);
+  var peg$e47 = peg$literalExpectation("assignee", true);
+  var peg$e48 = peg$literalExpectation("createdBy", true);
+  var peg$e49 = peg$literalExpectation("created-by", true);
+  var peg$e50 = peg$literalExpectation("action", true);
+  var peg$e51 = peg$otherExpectation("operator");
+  var peg$e52 = peg$classExpectation([":", "="], false, false);
+  var peg$e53 = peg$literalExpectation("!=", false);
+  var peg$e54 = peg$literalExpectation(">=", false);
+  var peg$e55 = peg$literalExpectation(">", false);
+  var peg$e56 = peg$literalExpectation("<=", false);
+  var peg$e57 = peg$literalExpectation("<", false);
+  var peg$e58 = peg$otherExpectation("word");
+  var peg$e59 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e60 = peg$otherExpectation("whitespace");
+  var peg$e61 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
+  var peg$e62 = peg$otherExpectation("quote");
+  var peg$e63 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e64 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
+  var peg$e65 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
+  var peg$e66 = peg$literalExpectation("\u201C", false);
+  var peg$e67 = peg$literalExpectation("\u201D", false);
+  var peg$e68 = peg$literalExpectation("\"", false);
+  var peg$e69 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e70 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e71 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
+  var peg$e72 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
+  var peg$e73 = peg$anyExpectation();
+  var peg$e74 = peg$classExpectation([","], false, false);
 
   var peg$f0 = function(filters) { return applyDefaults(filters); };
   var peg$f1 = function(head, tail) {
@@ -1158,19 +1160,28 @@ function peg$parse(input, options) {
   function peg$parsereportID() {
     var s0, s1;
 
-    s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c5) {
+    s0 = input.substr(peg$currPos, 8);
+    if (s0.toLowerCase() === peg$c5) {
       peg$currPos += 8;
     } else {
-      s1 = peg$FAILED;
+      s0 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e8); }
     }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$f11();
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 9);
+      if (s1.toLowerCase() === peg$c6) {
+        peg$currPos += 9;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e9); }
+      }
+      if (s1 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s1 = peg$f11();
+      }
+      s0 = s1;
     }
-    s0 = s1;
 
     return s0;
   }
@@ -1180,11 +1191,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 7);
-    if (s1.toLowerCase() === peg$c6) {
+    if (s1.toLowerCase() === peg$c7) {
       peg$currPos += 7;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e9); }
+      if (peg$silentFails === 0) { peg$fail(peg$e10); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1200,11 +1211,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
-    if (s1.toLowerCase() === peg$c7) {
+    if (s1.toLowerCase() === peg$c8) {
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e10); }
+      if (peg$silentFails === 0) { peg$fail(peg$e11); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1220,11 +1231,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c8) {
+    if (s1.toLowerCase() === peg$c9) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e11); }
+      if (peg$silentFails === 0) { peg$fail(peg$e12); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1240,11 +1251,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c9) {
+    if (s1.toLowerCase() === peg$c10) {
       peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e12); }
+      if (peg$silentFails === 0) { peg$fail(peg$e13); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1260,11 +1271,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c10) {
+    if (s1.toLowerCase() === peg$c11) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e13); }
+      if (peg$silentFails === 0) { peg$fail(peg$e14); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1280,11 +1291,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
-    if (s1.toLowerCase() === peg$c11) {
+    if (s1.toLowerCase() === peg$c12) {
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e14); }
+      if (peg$silentFails === 0) { peg$fail(peg$e15); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1300,11 +1311,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c12) {
+    if (s1.toLowerCase() === peg$c13) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e15); }
+      if (peg$silentFails === 0) { peg$fail(peg$e16); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1320,11 +1331,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c13) {
+    if (s1.toLowerCase() === peg$c14) {
       peg$currPos += 5;
     } 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;
@@ -1339,20 +1350,20 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
-    if (s0.toLowerCase() === peg$c14) {
+    if (s0.toLowerCase() === peg$c15) {
       peg$currPos += 7;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e17); }
+      if (peg$silentFails === 0) { peg$fail(peg$e18); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
-      if (s1.toLowerCase() === peg$c15) {
+      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;
@@ -1367,21 +1378,21 @@ function peg$parse(input, options) {
   function peg$parsecardID() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 6) === peg$c16) {
-      s0 = peg$c16;
+    if (input.substr(peg$currPos, 6) === peg$c17) {
+      s0 = peg$c17;
       peg$currPos += 6;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e19); }
+      if (peg$silentFails === 0) { peg$fail(peg$e20); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 4);
-      if (s1.toLowerCase() === peg$c17) {
+      if (s1.toLowerCase() === peg$c18) {
         peg$currPos += 4;
       } 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;
@@ -1398,11 +1409,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c18) {
+    if (s1.toLowerCase() === peg$c19) {
       peg$currPos += 4;
     } 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;
@@ -1416,21 +1427,21 @@ function peg$parse(input, options) {
   function peg$parseexpenseType() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 11) === peg$c19) {
-      s0 = peg$c19;
+    if (input.substr(peg$currPos, 11) === peg$c20) {
+      s0 = peg$c20;
       peg$currPos += 11;
     } 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, 12);
-      if (s1.toLowerCase() === peg$c20) {
+      if (s1.toLowerCase() === peg$c21) {
         peg$currPos += 12;
       } 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;
@@ -1445,21 +1456,21 @@ function peg$parse(input, options) {
   function peg$parsewithdrawalType() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 14) === peg$c21) {
-      s0 = peg$c21;
+    if (input.substr(peg$currPos, 14) === peg$c22) {
+      s0 = peg$c22;
       peg$currPos += 14;
     } 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, 15);
-      if (s1.toLowerCase() === peg$c22) {
+      if (s1.toLowerCase() === peg$c23) {
         peg$currPos += 15;
       } 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;
@@ -1476,11 +1487,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c23) {
+    if (s1.toLowerCase() === peg$c24) {
       peg$currPos += 8;
     } 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;
@@ -1496,11 +1507,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
-    if (s1.toLowerCase() === peg$c24) {
+    if (s1.toLowerCase() === peg$c25) {
       peg$currPos += 12;
     } 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;
@@ -1516,11 +1527,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c25) {
+    if (s1.toLowerCase() === peg$c26) {
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e28); }
+      if (peg$silentFails === 0) { peg$fail(peg$e29); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1536,11 +1547,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c26) {
+    if (s1.toLowerCase() === peg$c27) {
       peg$currPos += 6;
     } 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;
@@ -1554,21 +1565,21 @@ function peg$parse(input, options) {
   function peg$parsesortBy() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 6) === peg$c27) {
-      s0 = peg$c27;
+    if (input.substr(peg$currPos, 6) === peg$c28) {
+      s0 = peg$c28;
       peg$currPos += 6;
     } 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, 7);
-      if (s1.toLowerCase() === peg$c28) {
+      if (s1.toLowerCase() === peg$c29) {
         peg$currPos += 7;
       } 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;
@@ -1583,21 +1594,21 @@ function peg$parse(input, options) {
   function peg$parsesortOrder() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 9) === peg$c29) {
-      s0 = peg$c29;
+    if (input.substr(peg$currPos, 9) === peg$c30) {
+      s0 = peg$c30;
       peg$currPos += 9;
     } 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, 10);
-      if (s1.toLowerCase() === peg$c30) {
+      if (s1.toLowerCase() === peg$c31) {
         peg$currPos += 10;
       } 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;
@@ -1612,21 +1623,21 @@ function peg$parse(input, options) {
   function peg$parsepolicyID() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 8) === peg$c31) {
-      s0 = peg$c31;
+    if (input.substr(peg$currPos, 8) === peg$c32) {
+      s0 = peg$c32;
       peg$currPos += 8;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e34); }
+      if (peg$silentFails === 0) { peg$fail(peg$e35); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 9);
-      if (s1.toLowerCase() === peg$c32) {
+      if (s1.toLowerCase() === peg$c33) {
         peg$currPos += 9;
       } 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;
@@ -1643,11 +1654,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c33) {
+    if (s1.toLowerCase() === peg$c34) {
       peg$currPos += 9;
     } 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;
@@ -1663,11 +1674,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c34) {
+    if (s1.toLowerCase() === peg$c35) {
       peg$currPos += 8;
     } 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;
@@ -1683,11 +1694,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c35) {
+    if (s1.toLowerCase() === peg$c36) {
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e38); }
+      if (peg$silentFails === 0) { peg$fail(peg$e39); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1703,11 +1714,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c36) {
+    if (s1.toLowerCase() === peg$c37) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e39); }
+      if (peg$silentFails === 0) { peg$fail(peg$e40); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1723,11 +1734,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c37) {
+    if (s1.toLowerCase() === peg$c38) {
       peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e40); }
+      if (peg$silentFails === 0) { peg$fail(peg$e41); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1743,11 +1754,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c38) {
+    if (s1.toLowerCase() === peg$c39) {
       peg$currPos += 9;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e41); }
+      if (peg$silentFails === 0) { peg$fail(peg$e42); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1762,20 +1773,20 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
-    if (s0.toLowerCase() === peg$c39) {
+    if (s0.toLowerCase() === peg$c40) {
       peg$currPos += 7;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e42); }
+      if (peg$silentFails === 0) { peg$fail(peg$e43); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
-      if (s1.toLowerCase() === peg$c40) {
+      if (s1.toLowerCase() === peg$c41) {
         peg$currPos += 8;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e43); }
+        if (peg$silentFails === 0) { peg$fail(peg$e44); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
@@ -1792,11 +1803,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c41) {
+    if (s1.toLowerCase() === peg$c42) {
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e44); }
+      if (peg$silentFails === 0) { peg$fail(peg$e45); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1812,11 +1823,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c42) {
+    if (s1.toLowerCase() === peg$c43) {
       peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e45); }
+      if (peg$silentFails === 0) { peg$fail(peg$e46); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1832,11 +1843,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c43) {
+    if (s1.toLowerCase() === peg$c44) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e46); }
+      if (peg$silentFails === 0) { peg$fail(peg$e47); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1851,20 +1862,20 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 9);
-    if (s0.toLowerCase() === peg$c44) {
+    if (s0.toLowerCase() === peg$c45) {
       peg$currPos += 9;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e47); }
+      if (peg$silentFails === 0) { peg$fail(peg$e48); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 10);
-      if (s1.toLowerCase() === peg$c45) {
+      if (s1.toLowerCase() === peg$c46) {
         peg$currPos += 10;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e48); }
+        if (peg$silentFails === 0) { peg$fail(peg$e49); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
@@ -1881,11 +1892,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c46) {
+    if (s1.toLowerCase() === peg$c47) {
       peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e49); }
+      if (peg$silentFails === 0) { peg$fail(peg$e50); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1906,7 +1917,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e51); }
+      if (peg$silentFails === 0) { peg$fail(peg$e52); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1915,12 +1926,12 @@ function peg$parse(input, options) {
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c47) {
-        s1 = peg$c47;
+      if (input.substr(peg$currPos, 2) === peg$c48) {
+        s1 = peg$c48;
         peg$currPos += 2;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e52); }
+        if (peg$silentFails === 0) { peg$fail(peg$e53); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
@@ -1929,12 +1940,12 @@ function peg$parse(input, options) {
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 2) === peg$c48) {
-          s1 = peg$c48;
+        if (input.substr(peg$currPos, 2) === peg$c49) {
+          s1 = peg$c49;
           peg$currPos += 2;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e53); }
+          if (peg$silentFails === 0) { peg$fail(peg$e54); }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
@@ -1944,11 +1955,11 @@ function peg$parse(input, options) {
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
           if (input.charCodeAt(peg$currPos) === 62) {
-            s1 = peg$c49;
+            s1 = peg$c50;
             peg$currPos++;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e54); }
+            if (peg$silentFails === 0) { peg$fail(peg$e55); }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
@@ -1957,12 +1968,12 @@ function peg$parse(input, options) {
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 2) === peg$c50) {
-              s1 = peg$c50;
+            if (input.substr(peg$currPos, 2) === peg$c51) {
+              s1 = peg$c51;
               peg$currPos += 2;
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e55); }
+              if (peg$silentFails === 0) { peg$fail(peg$e56); }
             }
             if (s1 !== peg$FAILED) {
               peg$savedPos = s0;
@@ -1972,11 +1983,11 @@ function peg$parse(input, options) {
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
               if (input.charCodeAt(peg$currPos) === 60) {
-                s1 = peg$c51;
+                s1 = peg$c52;
                 peg$currPos++;
               } else {
                 s1 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e56); }
+                if (peg$silentFails === 0) { peg$fail(peg$e57); }
               }
               if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
@@ -1991,7 +2002,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e50); }
+      if (peg$silentFails === 0) { peg$fail(peg$e51); }
     }
 
     return s0;
@@ -2022,7 +2033,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e58); }
+      if (peg$silentFails === 0) { peg$fail(peg$e59); }
     }
     if (s2 !== peg$FAILED) {
       while (s2 !== peg$FAILED) {
@@ -2032,7 +2043,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e58); }
+          if (peg$silentFails === 0) { peg$fail(peg$e59); }
         }
       }
     } else {
@@ -2046,7 +2057,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e57); }
+      if (peg$silentFails === 0) { peg$fail(peg$e58); }
     }
 
     return s0;
@@ -2074,7 +2085,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e60); }
+      if (peg$silentFails === 0) { peg$fail(peg$e61); }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
@@ -2083,12 +2094,12 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e60); }
+        if (peg$silentFails === 0) { peg$fail(peg$e61); }
       }
     }
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e59); }
+    if (peg$silentFails === 0) { peg$fail(peg$e60); }
 
     return s0;
   }
@@ -2135,7 +2146,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e62); }
+      if (peg$silentFails === 0) { peg$fail(peg$e63); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -2144,7 +2155,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e62); }
+        if (peg$silentFails === 0) { peg$fail(peg$e63); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -2152,7 +2163,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e63); }
+      if (peg$silentFails === 0) { peg$fail(peg$e64); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -2161,7 +2172,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e64); }
+        if (peg$silentFails === 0) { peg$fail(peg$e65); }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
@@ -2170,7 +2181,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e64); }
+          if (peg$silentFails === 0) { peg$fail(peg$e65); }
         }
       }
       s4 = input.charAt(peg$currPos);
@@ -2178,7 +2189,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e63); }
+        if (peg$silentFails === 0) { peg$fail(peg$e64); }
       }
       if (s4 !== peg$FAILED) {
         s5 = [];
@@ -2187,7 +2198,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e58); }
+          if (peg$silentFails === 0) { peg$fail(peg$e59); }
         }
         while (s6 !== peg$FAILED) {
           s5.push(s6);
@@ -2196,7 +2207,7 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e58); }
+            if (peg$silentFails === 0) { peg$fail(peg$e59); }
           }
         }
         peg$savedPos = s0;
@@ -2212,7 +2223,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e61); }
+      if (peg$silentFails === 0) { peg$fail(peg$e62); }
     }
 
     return s0;
@@ -2229,7 +2240,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e62); }
+      if (peg$silentFails === 0) { peg$fail(peg$e63); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -2238,7 +2249,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e62); }
+        if (peg$silentFails === 0) { peg$fail(peg$e63); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -2246,7 +2257,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e63); }
+      if (peg$silentFails === 0) { peg$fail(peg$e64); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -2255,7 +2266,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e64); }
+        if (peg$silentFails === 0) { peg$fail(peg$e65); }
       }
       if (s4 === peg$FAILED) {
         s4 = peg$currPos;
@@ -2271,11 +2282,11 @@ function peg$parse(input, options) {
         }
         if (s5 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 8220) {
-            s6 = peg$c52;
+            s6 = peg$c53;
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e65); }
+            if (peg$silentFails === 0) { peg$fail(peg$e66); }
           }
           if (s6 !== peg$FAILED) {
             peg$savedPos = s4;
@@ -2302,11 +2313,11 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8221) {
-              s6 = peg$c53;
+              s6 = peg$c54;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e66); }
+              if (peg$silentFails === 0) { peg$fail(peg$e67); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
@@ -2333,11 +2344,11 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 34) {
-                s6 = peg$c54;
+                s6 = peg$c55;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e67); }
+                if (peg$silentFails === 0) { peg$fail(peg$e68); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
@@ -2360,7 +2371,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e64); }
+          if (peg$silentFails === 0) { peg$fail(peg$e65); }
         }
         if (s4 === peg$FAILED) {
           s4 = peg$currPos;
@@ -2376,11 +2387,11 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8220) {
-              s6 = peg$c52;
+              s6 = peg$c53;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e65); }
+              if (peg$silentFails === 0) { peg$fail(peg$e66); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
@@ -2407,11 +2418,11 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 8221) {
-                s6 = peg$c53;
+                s6 = peg$c54;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e66); }
+                if (peg$silentFails === 0) { peg$fail(peg$e67); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
@@ -2438,11 +2449,11 @@ function peg$parse(input, options) {
               }
               if (s5 !== peg$FAILED) {
                 if (input.charCodeAt(peg$currPos) === 34) {
-                  s6 = peg$c54;
+                  s6 = peg$c55;
                   peg$currPos++;
                 } else {
                   s6 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e67); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e68); }
                 }
                 if (s6 !== peg$FAILED) {
                   peg$savedPos = s4;
@@ -2474,7 +2485,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e61); }
+      if (peg$silentFails === 0) { peg$fail(peg$e62); }
     }
 
     return s0;
@@ -2489,7 +2500,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e63); }
+      if (peg$silentFails === 0) { peg$fail(peg$e64); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -2527,7 +2538,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e68); }
+      if (peg$silentFails === 0) { peg$fail(peg$e69); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -2536,7 +2547,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e68); }
+        if (peg$silentFails === 0) { peg$fail(peg$e69); }
       }
     }
     s2 = [];
@@ -2545,7 +2556,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s3 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e69); }
+      if (peg$silentFails === 0) { peg$fail(peg$e70); }
     }
     while (s3 !== peg$FAILED) {
       s2.push(s3);
@@ -2554,7 +2565,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e69); }
+        if (peg$silentFails === 0) { peg$fail(peg$e70); }
       }
     }
     s3 = [];
@@ -2563,7 +2574,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s4 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e70); }
+      if (peg$silentFails === 0) { peg$fail(peg$e71); }
     }
     while (s4 !== peg$FAILED) {
       s3.push(s4);
@@ -2572,7 +2583,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e70); }
+        if (peg$silentFails === 0) { peg$fail(peg$e71); }
       }
     }
     s4 = peg$parseoperator();
@@ -2591,7 +2602,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e71); }
+        if (peg$silentFails === 0) { peg$fail(peg$e72); }
       }
       while (s2 !== peg$FAILED) {
         s1.push(s2);
@@ -2600,7 +2611,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e71); }
+          if (peg$silentFails === 0) { peg$fail(peg$e72); }
         }
       }
       s2 = peg$currPos;
@@ -2621,7 +2632,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e72); }
+          if (peg$silentFails === 0) { peg$fail(peg$e73); }
         }
         peg$silentFails--;
         if (s4 === peg$FAILED) {
@@ -2647,7 +2658,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e73); }
+          if (peg$silentFails === 0) { peg$fail(peg$e74); }
         }
       }
     }
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index 312aa37f1e58..0aeb1745288f 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -79,8 +79,7 @@ const UserFriendlyKeyMap: Record<SearchFilterKey | typeof CONST.SEARCH.SYNTAX_RO
     taxRate: 'tax-rate',
     cardID: 'card',
     feed: 'feed',
-    // cspell:disable-next-line
-    reportID: 'reportid',
+    reportID: 'report-id',
     keyword: 'keyword',
     in: 'in',
     submitted: 'submitted',

From 2c1dfe13093eca1c7efc37b90e2b424c208f1b5c Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 13 Aug 2025 12:08:34 -0600
Subject: [PATCH 2/2] update tests

---
 tests/unit/SearchAutocompleteParserTest.ts         | 3 +--
 tests/unit/SearchParserTest.ts                     | 3 +--
 tests/utils/fixtures/searchParsersCommonQueries.ts | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/tests/unit/SearchAutocompleteParserTest.ts b/tests/unit/SearchAutocompleteParserTest.ts
index 207ed20a4125..5feb7a45a315 100644
--- a/tests/unit/SearchAutocompleteParserTest.ts
+++ b/tests/unit/SearchAutocompleteParserTest.ts
@@ -66,8 +66,7 @@ const tests = [
         },
     },
     {
-        // cspell:disable-next-line
-        query: 'date>2024-01-01 amount>100 merchant:"A B" description:A,B,C ,, reportid:123456789 word',
+        query: 'date>2024-01-01 amount>100 merchant:"A B" description:A,B,C ,, report-id:123456789 word',
         expected: {
             autocomplete: null,
             ranges: [],
diff --git a/tests/unit/SearchParserTest.ts b/tests/unit/SearchParserTest.ts
index 89e531308f40..da962d816688 100644
--- a/tests/unit/SearchParserTest.ts
+++ b/tests/unit/SearchParserTest.ts
@@ -297,8 +297,7 @@ const tests = [
         },
     },
     {
-        // cspell:disable-next-line
-        query: 'amount>100 amount<200 from:usera@user.com tax-rate:1234 card:1234 reportid:12345 tag:ecx date>2023-01-01',
+        query: 'amount>100 amount<200 from:usera@user.com tax-rate:1234 card:1234 report-id:12345 tag:ecx date>2023-01-01',
         expected: {
             type: 'expense',
             status: CONST.SEARCH.STATUS.EXPENSE.ALL,
diff --git a/tests/utils/fixtures/searchParsersCommonQueries.ts b/tests/utils/fixtures/searchParsersCommonQueries.ts
index fe2f881b795a..d829db13018c 100644
--- a/tests/utils/fixtures/searchParsersCommonQueries.ts
+++ b/tests/utils/fixtures/searchParsersCommonQueries.ts
@@ -3,8 +3,7 @@
  */
 const parserCommonTests = {
     simple: 'type:expense',
-    // cspell:disable-next-line
-    userFriendlyNames: 'tax-rate:rate1 expense-type:card card:"Big Bank" reportid:report',
+    userFriendlyNames: 'tax-rate:rate1 expense-type:card card:"Big Bank" report-id:report',
     oldNames: 'taxRate:rate1 expenseType:card cardID:"Big Bank" reportID:report',
     complex: 'amount>200 expense-type:cash,card description:"Las Vegas party" date:2024-06-01 category:travel,hotel,"meal & entertainment"',
     quotesIOS: 'type:expense category:“a b”',