diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index 180b0c4ed8fc..9c5a0e10fba0 100755
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -6472,7 +6472,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 be2ec16a17b1..5ba993497d92 100644
--- a/src/libs/SearchParser/autocompleteParser.js
+++ b/src/libs/SearchParser/autocompleteParser.js
@@ -189,57 +189,58 @@ 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 = "groupCurrency";
-  var peg$c10 = "group-currency";
-  var peg$c11 = "tag";
-  var peg$c12 = "category";
-  var peg$c13 = "to";
-  var peg$c14 = "exporter";
-  var peg$c15 = "payer";
-  var peg$c16 = "taxrate";
-  var peg$c17 = "tax-rate";
-  var peg$c18 = "cardID";
-  var peg$c19 = "card";
-  var peg$c20 = "from";
-  var peg$c21 = "expenseType";
-  var peg$c22 = "expense-type";
-  var peg$c23 = "withdrawalType";
-  var peg$c24 = "withdrawal-type";
-  var peg$c25 = "billable";
-  var peg$c26 = "reimbursable";
-  var peg$c27 = "type";
-  var peg$c28 = "status";
-  var peg$c29 = "sortBy";
-  var peg$c30 = "sort-by";
-  var peg$c31 = "sortOrder";
-  var peg$c32 = "sort-order";
-  var peg$c33 = "policyID";
-  var peg$c34 = "workspace";
-  var peg$c35 = "submitted";
-  var peg$c36 = "approved";
-  var peg$c37 = "paid";
-  var peg$c38 = "exported";
-  var peg$c39 = "posted";
-  var peg$c40 = "withdrawn";
-  var peg$c41 = "groupby";
-  var peg$c42 = "group-by";
-  var peg$c43 = "feed";
-  var peg$c44 = "title";
-  var peg$c45 = "assignee";
-  var peg$c46 = "createdby";
-  var peg$c47 = "created-by";
-  var peg$c48 = "action";
-  var peg$c49 = "!=";
-  var peg$c50 = ">=";
-  var peg$c51 = ">";
-  var peg$c52 = "<=";
-  var peg$c53 = "<";
-  var peg$c54 = "\u201C";
-  var peg$c55 = "\u201D";
-  var peg$c56 = "\"";
+  var peg$c6 = "report-id";
+  var peg$c7 = "keyword";
+  var peg$c8 = "in";
+  var peg$c9 = "currency";
+  var peg$c10 = "groupCurrency";
+  var peg$c11 = "group-currency";
+  var peg$c12 = "tag";
+  var peg$c13 = "category";
+  var peg$c14 = "to";
+  var peg$c15 = "exporter";
+  var peg$c16 = "payer";
+  var peg$c17 = "taxrate";
+  var peg$c18 = "tax-rate";
+  var peg$c19 = "cardID";
+  var peg$c20 = "card";
+  var peg$c21 = "from";
+  var peg$c22 = "expenseType";
+  var peg$c23 = "expense-type";
+  var peg$c24 = "withdrawalType";
+  var peg$c25 = "withdrawal-type";
+  var peg$c26 = "billable";
+  var peg$c27 = "reimbursable";
+  var peg$c28 = "type";
+  var peg$c29 = "status";
+  var peg$c30 = "sortBy";
+  var peg$c31 = "sort-by";
+  var peg$c32 = "sortOrder";
+  var peg$c33 = "sort-order";
+  var peg$c34 = "policyID";
+  var peg$c35 = "workspace";
+  var peg$c36 = "submitted";
+  var peg$c37 = "approved";
+  var peg$c38 = "paid";
+  var peg$c39 = "exported";
+  var peg$c40 = "posted";
+  var peg$c41 = "withdrawn";
+  var peg$c42 = "groupby";
+  var peg$c43 = "group-by";
+  var peg$c44 = "feed";
+  var peg$c45 = "title";
+  var peg$c46 = "assignee";
+  var peg$c47 = "createdby";
+  var peg$c48 = "created-by";
+  var peg$c49 = "action";
+  var peg$c50 = "!=";
+  var peg$c51 = ">=";
+  var peg$c52 = ">";
+  var peg$c53 = "<=";
+  var peg$c54 = "<";
+  var peg$c55 = "\u201C";
+  var peg$c56 = "\u201D";
+  var peg$c57 = "\"";
 
   var peg$r0 = /^[:=]/;
   var peg$r1 = /^[^ ,\t\n\r\xA0]/;
@@ -260,73 +261,74 @@ 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("groupCurrency", false);
-  var peg$e11 = peg$literalExpectation("group-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$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("groupCurrency", false);
+  var peg$e12 = peg$literalExpectation("group-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(ranges) { return { autocomplete, ranges }; };
   var peg$f1 = function(filters) { return filters.filter(Boolean).flat(); };
@@ -972,19 +974,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;
   }
@@ -994,11 +1005,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;
@@ -1014,11 +1025,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;
@@ -1034,11 +1045,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;
@@ -1052,21 +1063,21 @@ function peg$parse(input, options) {
   function peg$parsegroupCurrency() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 13) === peg$c9) {
-      s0 = peg$c9;
+    if (input.substr(peg$currPos, 13) === peg$c10) {
+      s0 = peg$c10;
       peg$currPos += 13;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e10); }
+      if (peg$silentFails === 0) { peg$fail(peg$e11); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 14);
-      if (s1.toLowerCase() === peg$c10) {
+      if (s1.toLowerCase() === peg$c11) {
         peg$currPos += 14;
       } 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;
@@ -1083,11 +1094,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c11) {
+    if (s1.toLowerCase() === peg$c12) {
       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;
@@ -1103,11 +1114,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;
@@ -1123,11 +1134,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
-    if (s1.toLowerCase() === peg$c13) {
+    if (s1.toLowerCase() === peg$c14) {
       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;
@@ -1143,11 +1154,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c14) {
+    if (s1.toLowerCase() === peg$c15) {
       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;
@@ -1163,11 +1174,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c15) {
+    if (s1.toLowerCase() === peg$c16) {
       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;
@@ -1182,20 +1193,20 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
-    if (s0.toLowerCase() === peg$c16) {
+    if (s0.toLowerCase() === peg$c17) {
       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$c17) {
+      if (s1.toLowerCase() === peg$c18) {
         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;
@@ -1210,21 +1221,21 @@ function peg$parse(input, options) {
   function peg$parsecardID() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 6) === peg$c18) {
-      s0 = peg$c18;
+    if (input.substr(peg$currPos, 6) === peg$c19) {
+      s0 = peg$c19;
       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$c19) {
+      if (s1.toLowerCase() === peg$c20) {
         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;
@@ -1241,11 +1252,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c20) {
+    if (s1.toLowerCase() === peg$c21) {
       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;
@@ -1259,21 +1270,21 @@ function peg$parse(input, options) {
   function peg$parseexpenseType() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 11) === peg$c21) {
-      s0 = peg$c21;
+    if (input.substr(peg$currPos, 11) === peg$c22) {
+      s0 = peg$c22;
       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$c22) {
+      if (s1.toLowerCase() === peg$c23) {
         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;
@@ -1288,21 +1299,21 @@ function peg$parse(input, options) {
   function peg$parsewithdrawalType() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 14) === peg$c23) {
-      s0 = peg$c23;
+    if (input.substr(peg$currPos, 14) === peg$c24) {
+      s0 = peg$c24;
       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$c24) {
+      if (s1.toLowerCase() === peg$c25) {
         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;
@@ -1319,11 +1330,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c25) {
+    if (s1.toLowerCase() === peg$c26) {
       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;
@@ -1339,11 +1350,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
-    if (s1.toLowerCase() === peg$c26) {
+    if (s1.toLowerCase() === peg$c27) {
       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;
@@ -1359,11 +1370,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c27) {
+    if (s1.toLowerCase() === peg$c28) {
       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;
@@ -1379,11 +1390,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c28) {
+    if (s1.toLowerCase() === peg$c29) {
       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;
@@ -1397,21 +1408,21 @@ function peg$parse(input, options) {
   function peg$parsesortBy() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 6) === peg$c29) {
-      s0 = peg$c29;
+    if (input.substr(peg$currPos, 6) === peg$c30) {
+      s0 = peg$c30;
       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$c30) {
+      if (s1.toLowerCase() === peg$c31) {
         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;
@@ -1426,21 +1437,21 @@ function peg$parse(input, options) {
   function peg$parsesortOrder() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 9) === peg$c31) {
-      s0 = peg$c31;
+    if (input.substr(peg$currPos, 9) === peg$c32) {
+      s0 = peg$c32;
       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$c32) {
+      if (s1.toLowerCase() === peg$c33) {
         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;
@@ -1455,21 +1466,21 @@ function peg$parse(input, options) {
   function peg$parsepolicyID() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 8) === peg$c33) {
-      s0 = peg$c33;
+    if (input.substr(peg$currPos, 8) === peg$c34) {
+      s0 = peg$c34;
       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$c34) {
+      if (s1.toLowerCase() === peg$c35) {
         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;
@@ -1486,11 +1497,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c35) {
+    if (s1.toLowerCase() === peg$c36) {
       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;
@@ -1506,11 +1517,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;
@@ -1526,11 +1537,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c37) {
+    if (s1.toLowerCase() === peg$c38) {
       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;
@@ -1546,11 +1557,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c38) {
+    if (s1.toLowerCase() === peg$c39) {
       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;
@@ -1566,11 +1577,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c39) {
+    if (s1.toLowerCase() === peg$c40) {
       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;
@@ -1586,11 +1597,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c40) {
+    if (s1.toLowerCase() === peg$c41) {
       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;
@@ -1605,20 +1616,20 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
-    if (s0.toLowerCase() === peg$c41) {
+    if (s0.toLowerCase() === peg$c42) {
       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$c42) {
+      if (s1.toLowerCase() === peg$c43) {
         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;
@@ -1635,11 +1646,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c43) {
+    if (s1.toLowerCase() === peg$c44) {
       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;
@@ -1655,11 +1666,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c44) {
+    if (s1.toLowerCase() === peg$c45) {
       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;
@@ -1675,11 +1686,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c45) {
+    if (s1.toLowerCase() === peg$c46) {
       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;
@@ -1694,20 +1705,20 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 9);
-    if (s0.toLowerCase() === peg$c46) {
+    if (s0.toLowerCase() === peg$c47) {
       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$c47) {
+      if (s1.toLowerCase() === peg$c48) {
         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;
@@ -1724,11 +1735,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c48) {
+    if (s1.toLowerCase() === peg$c49) {
       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;
@@ -1749,7 +1760,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;
@@ -1758,12 +1769,12 @@ function peg$parse(input, options) {
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c49) {
-        s1 = peg$c49;
+      if (input.substr(peg$currPos, 2) === peg$c50) {
+        s1 = peg$c50;
         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;
@@ -1772,12 +1783,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;
@@ -1787,11 +1798,11 @@ function peg$parse(input, options) {
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
           if (input.charCodeAt(peg$currPos) === 62) {
-            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;
@@ -1800,12 +1811,12 @@ function peg$parse(input, options) {
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 2) === peg$c52) {
-              s1 = peg$c52;
+            if (input.substr(peg$currPos, 2) === peg$c53) {
+              s1 = peg$c53;
               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;
@@ -1815,11 +1826,11 @@ function peg$parse(input, options) {
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
               if (input.charCodeAt(peg$currPos) === 60) {
-                s1 = peg$c53;
+                s1 = peg$c54;
                 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;
@@ -1834,7 +1845,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;
@@ -1865,7 +1876,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) {
@@ -1875,7 +1886,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 {
@@ -1889,7 +1900,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;
@@ -1917,7 +1928,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);
@@ -1926,12 +1937,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;
   }
@@ -1978,7 +1989,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);
@@ -1987,7 +1998,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);
@@ -1995,7 +2006,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 = [];
@@ -2004,7 +2015,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);
@@ -2013,7 +2024,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);
@@ -2021,7 +2032,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 = [];
@@ -2030,7 +2041,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);
@@ -2039,7 +2050,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;
@@ -2055,7 +2066,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;
@@ -2072,7 +2083,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);
@@ -2081,7 +2092,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);
@@ -2089,7 +2100,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 = [];
@@ -2098,7 +2109,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;
@@ -2114,11 +2125,11 @@ function peg$parse(input, options) {
         }
         if (s5 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 8220) {
-            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;
@@ -2145,11 +2156,11 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8221) {
-              s6 = peg$c55;
+              s6 = peg$c56;
               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;
@@ -2176,11 +2187,11 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 34) {
-                s6 = peg$c56;
+                s6 = peg$c57;
                 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;
@@ -2203,7 +2214,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;
@@ -2219,11 +2230,11 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8220) {
-              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;
@@ -2250,11 +2261,11 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 8221) {
-                s6 = peg$c55;
+                s6 = peg$c56;
                 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;
@@ -2281,11 +2292,11 @@ function peg$parse(input, options) {
               }
               if (s5 !== peg$FAILED) {
                 if (input.charCodeAt(peg$currPos) === 34) {
-                  s6 = peg$c56;
+                  s6 = peg$c57;
                   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;
@@ -2317,7 +2328,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;
@@ -2332,7 +2343,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;
@@ -2370,7 +2381,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);
@@ -2379,7 +2390,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 = [];
@@ -2388,7 +2399,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);
@@ -2397,7 +2408,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 = [];
@@ -2406,7 +2417,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);
@@ -2415,7 +2426,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();
@@ -2434,7 +2445,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);
@@ -2443,7 +2454,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;
@@ -2464,7 +2475,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) {
@@ -2490,7 +2501,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/SearchParser/baseRules.peggy b/src/libs/SearchParser/baseRules.peggy
index 32db55f05ed1..5a6a76b92659 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 7355df440ed7..ac66623b422e 100644
--- a/src/libs/SearchParser/searchParser.js
+++ b/src/libs/SearchParser/searchParser.js
@@ -190,57 +190,58 @@ 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 = "groupCurrency";
-  var peg$c10 = "group-currency";
-  var peg$c11 = "tag";
-  var peg$c12 = "category";
-  var peg$c13 = "to";
-  var peg$c14 = "exporter";
-  var peg$c15 = "payer";
-  var peg$c16 = "taxrate";
-  var peg$c17 = "tax-rate";
-  var peg$c18 = "cardID";
-  var peg$c19 = "card";
-  var peg$c20 = "from";
-  var peg$c21 = "expenseType";
-  var peg$c22 = "expense-type";
-  var peg$c23 = "withdrawalType";
-  var peg$c24 = "withdrawal-type";
-  var peg$c25 = "billable";
-  var peg$c26 = "reimbursable";
-  var peg$c27 = "type";
-  var peg$c28 = "status";
-  var peg$c29 = "sortBy";
-  var peg$c30 = "sort-by";
-  var peg$c31 = "sortOrder";
-  var peg$c32 = "sort-order";
-  var peg$c33 = "policyID";
-  var peg$c34 = "workspace";
-  var peg$c35 = "submitted";
-  var peg$c36 = "approved";
-  var peg$c37 = "paid";
-  var peg$c38 = "exported";
-  var peg$c39 = "posted";
-  var peg$c40 = "withdrawn";
-  var peg$c41 = "groupby";
-  var peg$c42 = "group-by";
-  var peg$c43 = "feed";
-  var peg$c44 = "title";
-  var peg$c45 = "assignee";
-  var peg$c46 = "createdby";
-  var peg$c47 = "created-by";
-  var peg$c48 = "action";
-  var peg$c49 = "!=";
-  var peg$c50 = ">=";
-  var peg$c51 = ">";
-  var peg$c52 = "<=";
-  var peg$c53 = "<";
-  var peg$c54 = "\u201C";
-  var peg$c55 = "\u201D";
-  var peg$c56 = "\"";
+  var peg$c6 = "report-id";
+  var peg$c7 = "keyword";
+  var peg$c8 = "in";
+  var peg$c9 = "currency";
+  var peg$c10 = "groupCurrency";
+  var peg$c11 = "group-currency";
+  var peg$c12 = "tag";
+  var peg$c13 = "category";
+  var peg$c14 = "to";
+  var peg$c15 = "exporter";
+  var peg$c16 = "payer";
+  var peg$c17 = "taxrate";
+  var peg$c18 = "tax-rate";
+  var peg$c19 = "cardID";
+  var peg$c20 = "card";
+  var peg$c21 = "from";
+  var peg$c22 = "expenseType";
+  var peg$c23 = "expense-type";
+  var peg$c24 = "withdrawalType";
+  var peg$c25 = "withdrawal-type";
+  var peg$c26 = "billable";
+  var peg$c27 = "reimbursable";
+  var peg$c28 = "type";
+  var peg$c29 = "status";
+  var peg$c30 = "sortBy";
+  var peg$c31 = "sort-by";
+  var peg$c32 = "sortOrder";
+  var peg$c33 = "sort-order";
+  var peg$c34 = "policyID";
+  var peg$c35 = "workspace";
+  var peg$c36 = "submitted";
+  var peg$c37 = "approved";
+  var peg$c38 = "paid";
+  var peg$c39 = "exported";
+  var peg$c40 = "posted";
+  var peg$c41 = "withdrawn";
+  var peg$c42 = "groupby";
+  var peg$c43 = "group-by";
+  var peg$c44 = "feed";
+  var peg$c45 = "title";
+  var peg$c46 = "assignee";
+  var peg$c47 = "createdby";
+  var peg$c48 = "created-by";
+  var peg$c49 = "action";
+  var peg$c50 = "!=";
+  var peg$c51 = ">=";
+  var peg$c52 = ">";
+  var peg$c53 = "<=";
+  var peg$c54 = "<";
+  var peg$c55 = "\u201C";
+  var peg$c56 = "\u201D";
+  var peg$c57 = "\"";
 
   var peg$r0 = /^[^ \t\r\n\xA0]/;
   var peg$r1 = /^[:=]/;
@@ -264,73 +265,74 @@ 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("groupCurrency", false);
-  var peg$e13 = peg$literalExpectation("group-currency", true);
-  var peg$e14 = peg$literalExpectation("tag", true);
-  var peg$e15 = peg$literalExpectation("category", true);
-  var peg$e16 = peg$literalExpectation("to", true);
-  var peg$e17 = peg$literalExpectation("exporter", true);
-  var peg$e18 = peg$literalExpectation("payer", true);
-  var peg$e19 = peg$literalExpectation("taxRate", true);
-  var peg$e20 = peg$literalExpectation("tax-rate", true);
-  var peg$e21 = peg$literalExpectation("cardID", false);
-  var peg$e22 = peg$literalExpectation("card", true);
-  var peg$e23 = peg$literalExpectation("from", true);
-  var peg$e24 = peg$literalExpectation("expenseType", false);
-  var peg$e25 = peg$literalExpectation("expense-type", true);
-  var peg$e26 = peg$literalExpectation("withdrawalType", false);
-  var peg$e27 = peg$literalExpectation("withdrawal-type", true);
-  var peg$e28 = peg$literalExpectation("billable", true);
-  var peg$e29 = peg$literalExpectation("reimbursable", true);
-  var peg$e30 = peg$literalExpectation("type", true);
-  var peg$e31 = peg$literalExpectation("status", true);
-  var peg$e32 = peg$literalExpectation("sortBy", false);
-  var peg$e33 = peg$literalExpectation("sort-by", true);
-  var peg$e34 = peg$literalExpectation("sortOrder", false);
-  var peg$e35 = peg$literalExpectation("sort-order", true);
-  var peg$e36 = peg$literalExpectation("policyID", false);
-  var peg$e37 = peg$literalExpectation("workspace", true);
-  var peg$e38 = peg$literalExpectation("submitted", true);
-  var peg$e39 = peg$literalExpectation("approved", true);
-  var peg$e40 = peg$literalExpectation("paid", true);
-  var peg$e41 = peg$literalExpectation("exported", true);
-  var peg$e42 = peg$literalExpectation("posted", true);
-  var peg$e43 = peg$literalExpectation("withdrawn", true);
-  var peg$e44 = peg$literalExpectation("groupBy", true);
-  var peg$e45 = peg$literalExpectation("group-by", true);
-  var peg$e46 = peg$literalExpectation("feed", true);
-  var peg$e47 = peg$literalExpectation("title", true);
-  var peg$e48 = peg$literalExpectation("assignee", true);
-  var peg$e49 = peg$literalExpectation("createdBy", true);
-  var peg$e50 = peg$literalExpectation("created-by", true);
-  var peg$e51 = peg$literalExpectation("action", true);
-  var peg$e52 = peg$otherExpectation("operator");
-  var peg$e53 = peg$classExpectation([":", "="], false, 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$literalExpectation("<", false);
-  var peg$e59 = peg$otherExpectation("word");
-  var peg$e60 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e61 = peg$otherExpectation("whitespace");
-  var peg$e62 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
-  var peg$e63 = peg$otherExpectation("quote");
-  var peg$e64 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e65 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
-  var peg$e66 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
-  var peg$e67 = peg$literalExpectation("\u201C", false);
-  var peg$e68 = peg$literalExpectation("\u201D", false);
-  var peg$e69 = peg$literalExpectation("\"", false);
-  var peg$e70 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e71 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e72 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
-  var peg$e73 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
-  var peg$e74 = peg$anyExpectation();
-  var peg$e75 = 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("groupCurrency", false);
+  var peg$e14 = peg$literalExpectation("group-currency", true);
+  var peg$e15 = peg$literalExpectation("tag", true);
+  var peg$e16 = peg$literalExpectation("category", true);
+  var peg$e17 = peg$literalExpectation("to", true);
+  var peg$e18 = peg$literalExpectation("exporter", true);
+  var peg$e19 = peg$literalExpectation("payer", true);
+  var peg$e20 = peg$literalExpectation("taxRate", true);
+  var peg$e21 = peg$literalExpectation("tax-rate", true);
+  var peg$e22 = peg$literalExpectation("cardID", false);
+  var peg$e23 = peg$literalExpectation("card", true);
+  var peg$e24 = peg$literalExpectation("from", true);
+  var peg$e25 = peg$literalExpectation("expenseType", false);
+  var peg$e26 = peg$literalExpectation("expense-type", true);
+  var peg$e27 = peg$literalExpectation("withdrawalType", false);
+  var peg$e28 = peg$literalExpectation("withdrawal-type", true);
+  var peg$e29 = peg$literalExpectation("billable", true);
+  var peg$e30 = peg$literalExpectation("reimbursable", true);
+  var peg$e31 = peg$literalExpectation("type", true);
+  var peg$e32 = peg$literalExpectation("status", true);
+  var peg$e33 = peg$literalExpectation("sortBy", false);
+  var peg$e34 = peg$literalExpectation("sort-by", true);
+  var peg$e35 = peg$literalExpectation("sortOrder", false);
+  var peg$e36 = peg$literalExpectation("sort-order", true);
+  var peg$e37 = peg$literalExpectation("policyID", false);
+  var peg$e38 = peg$literalExpectation("workspace", true);
+  var peg$e39 = peg$literalExpectation("submitted", true);
+  var peg$e40 = peg$literalExpectation("approved", true);
+  var peg$e41 = peg$literalExpectation("paid", true);
+  var peg$e42 = peg$literalExpectation("exported", true);
+  var peg$e43 = peg$literalExpectation("posted", true);
+  var peg$e44 = peg$literalExpectation("withdrawn", true);
+  var peg$e45 = peg$literalExpectation("groupBy", true);
+  var peg$e46 = peg$literalExpectation("group-by", true);
+  var peg$e47 = peg$literalExpectation("feed", true);
+  var peg$e48 = peg$literalExpectation("title", true);
+  var peg$e49 = peg$literalExpectation("assignee", true);
+  var peg$e50 = peg$literalExpectation("createdBy", true);
+  var peg$e51 = peg$literalExpectation("created-by", true);
+  var peg$e52 = peg$literalExpectation("action", true);
+  var peg$e53 = peg$otherExpectation("operator");
+  var peg$e54 = peg$classExpectation([":", "="], false, false);
+  var peg$e55 = peg$literalExpectation("!=", false);
+  var peg$e56 = peg$literalExpectation(">=", false);
+  var peg$e57 = peg$literalExpectation(">", false);
+  var peg$e58 = peg$literalExpectation("<=", false);
+  var peg$e59 = peg$literalExpectation("<", false);
+  var peg$e60 = peg$otherExpectation("word");
+  var peg$e61 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e62 = peg$otherExpectation("whitespace");
+  var peg$e63 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
+  var peg$e64 = peg$otherExpectation("quote");
+  var peg$e65 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e66 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
+  var peg$e67 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
+  var peg$e68 = peg$literalExpectation("\u201C", false);
+  var peg$e69 = peg$literalExpectation("\u201D", false);
+  var peg$e70 = peg$literalExpectation("\"", false);
+  var peg$e71 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e72 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e73 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
+  var peg$e74 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
+  var peg$e75 = peg$anyExpectation();
+  var peg$e76 = peg$classExpectation([","], false, false);
 
   var peg$f0 = function(filters) { return applyDefaults(filters); };
   var peg$f1 = function(head, tail) {
@@ -1166,19 +1168,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;
   }
@@ -1188,11 +1199,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;
@@ -1208,11 +1219,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;
@@ -1228,11 +1239,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;
@@ -1246,21 +1257,21 @@ function peg$parse(input, options) {
   function peg$parsegroupCurrency() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 13) === peg$c9) {
-      s0 = peg$c9;
+    if (input.substr(peg$currPos, 13) === peg$c10) {
+      s0 = peg$c10;
       peg$currPos += 13;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e12); }
+      if (peg$silentFails === 0) { peg$fail(peg$e13); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 14);
-      if (s1.toLowerCase() === peg$c10) {
+      if (s1.toLowerCase() === peg$c11) {
         peg$currPos += 14;
       } 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;
@@ -1277,11 +1288,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c11) {
+    if (s1.toLowerCase() === peg$c12) {
       peg$currPos += 3;
     } 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;
@@ -1297,11 +1308,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;
@@ -1317,11 +1328,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
-    if (s1.toLowerCase() === peg$c13) {
+    if (s1.toLowerCase() === peg$c14) {
       peg$currPos += 2;
     } 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;
@@ -1337,11 +1348,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c14) {
+    if (s1.toLowerCase() === peg$c15) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e17); }
+      if (peg$silentFails === 0) { peg$fail(peg$e18); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1357,11 +1368,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c15) {
+    if (s1.toLowerCase() === peg$c16) {
       peg$currPos += 5;
     } 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;
@@ -1376,20 +1387,20 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
-    if (s0.toLowerCase() === peg$c16) {
+    if (s0.toLowerCase() === peg$c17) {
       peg$currPos += 7;
     } 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, 8);
-      if (s1.toLowerCase() === peg$c17) {
+      if (s1.toLowerCase() === peg$c18) {
         peg$currPos += 8;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e20); }
+        if (peg$silentFails === 0) { peg$fail(peg$e21); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
@@ -1404,21 +1415,21 @@ function peg$parse(input, options) {
   function peg$parsecardID() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 6) === peg$c18) {
-      s0 = peg$c18;
+    if (input.substr(peg$currPos, 6) === peg$c19) {
+      s0 = peg$c19;
       peg$currPos += 6;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e21); }
+      if (peg$silentFails === 0) { peg$fail(peg$e22); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 4);
-      if (s1.toLowerCase() === peg$c19) {
+      if (s1.toLowerCase() === peg$c20) {
         peg$currPos += 4;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e22); }
+        if (peg$silentFails === 0) { peg$fail(peg$e23); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
@@ -1435,11 +1446,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c20) {
+    if (s1.toLowerCase() === peg$c21) {
       peg$currPos += 4;
     } 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;
@@ -1453,21 +1464,21 @@ function peg$parse(input, options) {
   function peg$parseexpenseType() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 11) === peg$c21) {
-      s0 = peg$c21;
+    if (input.substr(peg$currPos, 11) === peg$c22) {
+      s0 = peg$c22;
       peg$currPos += 11;
     } 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, 12);
-      if (s1.toLowerCase() === peg$c22) {
+      if (s1.toLowerCase() === peg$c23) {
         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;
@@ -1482,21 +1493,21 @@ function peg$parse(input, options) {
   function peg$parsewithdrawalType() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 14) === peg$c23) {
-      s0 = peg$c23;
+    if (input.substr(peg$currPos, 14) === peg$c24) {
+      s0 = peg$c24;
       peg$currPos += 14;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e26); }
+      if (peg$silentFails === 0) { peg$fail(peg$e27); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 15);
-      if (s1.toLowerCase() === peg$c24) {
+      if (s1.toLowerCase() === peg$c25) {
         peg$currPos += 15;
       } 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;
@@ -1513,11 +1524,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c25) {
+    if (s1.toLowerCase() === peg$c26) {
       peg$currPos += 8;
     } 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;
@@ -1533,11 +1544,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
-    if (s1.toLowerCase() === peg$c26) {
+    if (s1.toLowerCase() === peg$c27) {
       peg$currPos += 12;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e29); }
+      if (peg$silentFails === 0) { peg$fail(peg$e30); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1553,11 +1564,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c27) {
+    if (s1.toLowerCase() === peg$c28) {
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e30); }
+      if (peg$silentFails === 0) { peg$fail(peg$e31); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -1573,11 +1584,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c28) {
+    if (s1.toLowerCase() === peg$c29) {
       peg$currPos += 6;
     } 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;
@@ -1591,21 +1602,21 @@ function peg$parse(input, options) {
   function peg$parsesortBy() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 6) === peg$c29) {
-      s0 = peg$c29;
+    if (input.substr(peg$currPos, 6) === peg$c30) {
+      s0 = peg$c30;
       peg$currPos += 6;
     } 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, 7);
-      if (s1.toLowerCase() === peg$c30) {
+      if (s1.toLowerCase() === peg$c31) {
         peg$currPos += 7;
       } 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;
@@ -1620,21 +1631,21 @@ function peg$parse(input, options) {
   function peg$parsesortOrder() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 9) === peg$c31) {
-      s0 = peg$c31;
+    if (input.substr(peg$currPos, 9) === peg$c32) {
+      s0 = peg$c32;
       peg$currPos += 9;
     } 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, 10);
-      if (s1.toLowerCase() === peg$c32) {
+      if (s1.toLowerCase() === peg$c33) {
         peg$currPos += 10;
       } 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;
@@ -1649,21 +1660,21 @@ function peg$parse(input, options) {
   function peg$parsepolicyID() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 8) === peg$c33) {
-      s0 = peg$c33;
+    if (input.substr(peg$currPos, 8) === peg$c34) {
+      s0 = peg$c34;
       peg$currPos += 8;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e36); }
+      if (peg$silentFails === 0) { peg$fail(peg$e37); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 9);
-      if (s1.toLowerCase() === peg$c34) {
+      if (s1.toLowerCase() === peg$c35) {
         peg$currPos += 9;
       } 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;
@@ -1680,11 +1691,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c35) {
+    if (s1.toLowerCase() === peg$c36) {
       peg$currPos += 9;
     } 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;
@@ -1700,11 +1711,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;
@@ -1720,11 +1731,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c37) {
+    if (s1.toLowerCase() === peg$c38) {
       peg$currPos += 4;
     } 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;
@@ -1740,11 +1751,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c38) {
+    if (s1.toLowerCase() === peg$c39) {
       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;
@@ -1760,11 +1771,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c39) {
+    if (s1.toLowerCase() === peg$c40) {
       peg$currPos += 6;
     } 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;
@@ -1780,11 +1791,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c40) {
+    if (s1.toLowerCase() === peg$c41) {
       peg$currPos += 9;
     } 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;
@@ -1799,20 +1810,20 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
-    if (s0.toLowerCase() === peg$c41) {
+    if (s0.toLowerCase() === peg$c42) {
       peg$currPos += 7;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e44); }
+      if (peg$silentFails === 0) { peg$fail(peg$e45); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
-      if (s1.toLowerCase() === peg$c42) {
+      if (s1.toLowerCase() === peg$c43) {
         peg$currPos += 8;
       } 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;
@@ -1829,11 +1840,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c43) {
+    if (s1.toLowerCase() === peg$c44) {
       peg$currPos += 4;
     } 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;
@@ -1849,11 +1860,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c44) {
+    if (s1.toLowerCase() === peg$c45) {
       peg$currPos += 5;
     } 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;
@@ -1869,11 +1880,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c45) {
+    if (s1.toLowerCase() === peg$c46) {
       peg$currPos += 8;
     } 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;
@@ -1888,20 +1899,20 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 9);
-    if (s0.toLowerCase() === peg$c46) {
+    if (s0.toLowerCase() === peg$c47) {
       peg$currPos += 9;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e49); }
+      if (peg$silentFails === 0) { peg$fail(peg$e50); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 10);
-      if (s1.toLowerCase() === peg$c47) {
+      if (s1.toLowerCase() === peg$c48) {
         peg$currPos += 10;
       } 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;
@@ -1918,11 +1929,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c48) {
+    if (s1.toLowerCase() === peg$c49) {
       peg$currPos += 6;
     } 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;
@@ -1943,7 +1954,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } 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;
@@ -1952,12 +1963,12 @@ function peg$parse(input, options) {
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c49) {
-        s1 = peg$c49;
+      if (input.substr(peg$currPos, 2) === peg$c50) {
+        s1 = peg$c50;
         peg$currPos += 2;
       } 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;
@@ -1966,12 +1977,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;
@@ -1981,11 +1992,11 @@ function peg$parse(input, options) {
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
           if (input.charCodeAt(peg$currPos) === 62) {
-            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;
@@ -1994,12 +2005,12 @@ function peg$parse(input, options) {
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 2) === peg$c52) {
-              s1 = peg$c52;
+            if (input.substr(peg$currPos, 2) === peg$c53) {
+              s1 = peg$c53;
               peg$currPos += 2;
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e57); }
+              if (peg$silentFails === 0) { peg$fail(peg$e58); }
             }
             if (s1 !== peg$FAILED) {
               peg$savedPos = s0;
@@ -2009,11 +2020,11 @@ function peg$parse(input, options) {
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
               if (input.charCodeAt(peg$currPos) === 60) {
-                s1 = peg$c53;
+                s1 = peg$c54;
                 peg$currPos++;
               } else {
                 s1 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e58); }
+                if (peg$silentFails === 0) { peg$fail(peg$e59); }
               }
               if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
@@ -2028,7 +2039,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e52); }
+      if (peg$silentFails === 0) { peg$fail(peg$e53); }
     }
 
     return s0;
@@ -2059,7 +2070,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); }
     }
     if (s2 !== peg$FAILED) {
       while (s2 !== peg$FAILED) {
@@ -2069,7 +2080,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); }
         }
       }
     } else {
@@ -2083,7 +2094,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;
@@ -2111,7 +2122,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e62); }
+      if (peg$silentFails === 0) { peg$fail(peg$e63); }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
@@ -2120,12 +2131,12 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e62); }
+        if (peg$silentFails === 0) { peg$fail(peg$e63); }
       }
     }
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e61); }
+    if (peg$silentFails === 0) { peg$fail(peg$e62); }
 
     return s0;
   }
@@ -2172,7 +2183,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e64); }
+      if (peg$silentFails === 0) { peg$fail(peg$e65); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -2181,7 +2192,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e64); }
+        if (peg$silentFails === 0) { peg$fail(peg$e65); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -2189,7 +2200,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e65); }
+      if (peg$silentFails === 0) { peg$fail(peg$e66); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -2198,7 +2209,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e66); }
+        if (peg$silentFails === 0) { peg$fail(peg$e67); }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
@@ -2207,7 +2218,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e66); }
+          if (peg$silentFails === 0) { peg$fail(peg$e67); }
         }
       }
       s4 = input.charAt(peg$currPos);
@@ -2215,7 +2226,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e65); }
+        if (peg$silentFails === 0) { peg$fail(peg$e66); }
       }
       if (s4 !== peg$FAILED) {
         s5 = [];
@@ -2224,7 +2235,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e60); }
+          if (peg$silentFails === 0) { peg$fail(peg$e61); }
         }
         while (s6 !== peg$FAILED) {
           s5.push(s6);
@@ -2233,7 +2244,7 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e60); }
+            if (peg$silentFails === 0) { peg$fail(peg$e61); }
           }
         }
         peg$savedPos = s0;
@@ -2249,7 +2260,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e63); }
+      if (peg$silentFails === 0) { peg$fail(peg$e64); }
     }
 
     return s0;
@@ -2266,7 +2277,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e64); }
+      if (peg$silentFails === 0) { peg$fail(peg$e65); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -2275,7 +2286,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e64); }
+        if (peg$silentFails === 0) { peg$fail(peg$e65); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -2283,7 +2294,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e65); }
+      if (peg$silentFails === 0) { peg$fail(peg$e66); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -2292,7 +2303,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e66); }
+        if (peg$silentFails === 0) { peg$fail(peg$e67); }
       }
       if (s4 === peg$FAILED) {
         s4 = peg$currPos;
@@ -2308,11 +2319,11 @@ function peg$parse(input, options) {
         }
         if (s5 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 8220) {
-            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;
@@ -2339,11 +2350,11 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8221) {
-              s6 = peg$c55;
+              s6 = peg$c56;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e68); }
+              if (peg$silentFails === 0) { peg$fail(peg$e69); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
@@ -2370,11 +2381,11 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 34) {
-                s6 = peg$c56;
+                s6 = peg$c57;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e69); }
+                if (peg$silentFails === 0) { peg$fail(peg$e70); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
@@ -2397,7 +2408,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e66); }
+          if (peg$silentFails === 0) { peg$fail(peg$e67); }
         }
         if (s4 === peg$FAILED) {
           s4 = peg$currPos;
@@ -2413,11 +2424,11 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8220) {
-              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;
@@ -2444,11 +2455,11 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 8221) {
-                s6 = peg$c55;
+                s6 = peg$c56;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e68); }
+                if (peg$silentFails === 0) { peg$fail(peg$e69); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
@@ -2475,11 +2486,11 @@ function peg$parse(input, options) {
               }
               if (s5 !== peg$FAILED) {
                 if (input.charCodeAt(peg$currPos) === 34) {
-                  s6 = peg$c56;
+                  s6 = peg$c57;
                   peg$currPos++;
                 } else {
                   s6 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e69); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e70); }
                 }
                 if (s6 !== peg$FAILED) {
                   peg$savedPos = s4;
@@ -2511,7 +2522,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e63); }
+      if (peg$silentFails === 0) { peg$fail(peg$e64); }
     }
 
     return s0;
@@ -2526,7 +2537,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e65); }
+      if (peg$silentFails === 0) { peg$fail(peg$e66); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -2564,7 +2575,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e70); }
+      if (peg$silentFails === 0) { peg$fail(peg$e71); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -2573,7 +2584,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e70); }
+        if (peg$silentFails === 0) { peg$fail(peg$e71); }
       }
     }
     s2 = [];
@@ -2582,7 +2593,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s3 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e71); }
+      if (peg$silentFails === 0) { peg$fail(peg$e72); }
     }
     while (s3 !== peg$FAILED) {
       s2.push(s3);
@@ -2591,7 +2602,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e71); }
+        if (peg$silentFails === 0) { peg$fail(peg$e72); }
       }
     }
     s3 = [];
@@ -2600,7 +2611,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); }
     }
     while (s4 !== peg$FAILED) {
       s3.push(s4);
@@ -2609,7 +2620,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); }
       }
     }
     s4 = peg$parseoperator();
@@ -2628,7 +2639,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e73); }
+        if (peg$silentFails === 0) { peg$fail(peg$e74); }
       }
       while (s2 !== peg$FAILED) {
         s1.push(s2);
@@ -2637,7 +2648,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e73); }
+          if (peg$silentFails === 0) { peg$fail(peg$e74); }
         }
       }
       s2 = peg$currPos;
@@ -2658,7 +2669,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e74); }
+          if (peg$silentFails === 0) { peg$fail(peg$e75); }
         }
         peg$silentFails--;
         if (s4 === peg$FAILED) {
@@ -2684,7 +2695,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e75); }
+          if (peg$silentFails === 0) { peg$fail(peg$e76); }
         }
       }
     }
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index 7c9479d6cd16..8cf9d65dcf79 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -80,8 +80,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',
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”',