diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index 23bf9c07d228..b24f427bc487 100644
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -7342,6 +7342,9 @@ const CONST = {
             IS: 'is',
             REPORT_FIELD: 'reportField',
             EXPORTED_TO: 'exportedTo',
+            SUBMITTER_USER_ID: 'submitterUserID',
+            SUBMITTER_PAYROLL_ID: 'submitterPayrollID',
+            ORDER_DEAL_NUMBERS: 'orderDealNumbers',
         },
         REPORT_FIELD: {
             // All report fields start with this, so use this to check if a search key is a report field
@@ -7418,6 +7421,9 @@ const CONST = {
             IS: 'is',
             REPORT_FIELD: 'report-field',
             EXPORTED_TO: 'exported-to',
+            SUBMITTER_USER_ID: 'submitter-user-id',
+            SUBMITTER_PAYROLL_ID: 'submitter-payroll-id',
+            ORDER_DEAL_NUMBERS: 'order-deal-numbers',
             COLUMNS: 'columns',
             LIMIT: 'limit',
         },
diff --git a/src/components/Search/types.ts b/src/components/Search/types.ts
index 6d7f63e8b748..a4b38f5c81be 100644
--- a/src/components/Search/types.ts
+++ b/src/components/Search/types.ts
@@ -303,6 +303,9 @@ type SearchTextFilterKeys =
     | typeof CONST.SEARCH.SYNTAX_FILTER_KEYS.KEYWORD
     | typeof CONST.SEARCH.SYNTAX_FILTER_KEYS.TITLE
     | typeof CONST.SEARCH.SYNTAX_FILTER_KEYS.WITHDRAWAL_ID
+    | typeof CONST.SEARCH.SYNTAX_FILTER_KEYS.SUBMITTER_USER_ID
+    | typeof CONST.SEARCH.SYNTAX_FILTER_KEYS.SUBMITTER_PAYROLL_ID
+    | typeof CONST.SEARCH.SYNTAX_FILTER_KEYS.ORDER_DEAL_NUMBERS
     | typeof CONST.SEARCH.SYNTAX_ROOT_KEYS.LIMIT
     | ReportFieldTextKey;
 
diff --git a/src/hooks/useAdvancedSearchFilters.ts b/src/hooks/useAdvancedSearchFilters.ts
index 0c114afd7f26..2577b21ae7aa 100644
--- a/src/hooks/useAdvancedSearchFilters.ts
+++ b/src/hooks/useAdvancedSearchFilters.ts
@@ -54,6 +54,9 @@ const typeFiltersKeys = {
             CONST.SEARCH.SYNTAX_FILTER_KEYS.RECEIPT_TYPE,
             CONST.SEARCH.SYNTAX_FILTER_KEYS.REPORT_ID,
             CONST.SEARCH.SYNTAX_FILTER_KEYS.REPORT_FIELD,
+            CONST.SEARCH.SYNTAX_FILTER_KEYS.SUBMITTER_USER_ID,
+            CONST.SEARCH.SYNTAX_FILTER_KEYS.SUBMITTER_PAYROLL_ID,
+            CONST.SEARCH.SYNTAX_FILTER_KEYS.ORDER_DEAL_NUMBERS,
             CONST.SEARCH.SYNTAX_FILTER_KEYS.HAS,
             CONST.SEARCH.SYNTAX_FILTER_KEYS.KEYWORD,
         ],
@@ -89,6 +92,9 @@ const typeFiltersKeys = {
             CONST.SEARCH.SYNTAX_FILTER_KEYS.TITLE,
             CONST.SEARCH.SYNTAX_FILTER_KEYS.REPORT_ID,
             CONST.SEARCH.SYNTAX_FILTER_KEYS.REPORT_FIELD,
+            CONST.SEARCH.SYNTAX_FILTER_KEYS.SUBMITTER_USER_ID,
+            CONST.SEARCH.SYNTAX_FILTER_KEYS.SUBMITTER_PAYROLL_ID,
+            CONST.SEARCH.SYNTAX_FILTER_KEYS.ORDER_DEAL_NUMBERS,
             CONST.SEARCH.SYNTAX_FILTER_KEYS.KEYWORD,
         ],
         [CONST.SEARCH.SYNTAX_FILTER_KEYS.SUBMITTED, CONST.SEARCH.SYNTAX_FILTER_KEYS.APPROVED, CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPORTED, CONST.SEARCH.SYNTAX_FILTER_KEYS.PAID],
diff --git a/src/libs/SearchParser/autocompleteParser.js b/src/libs/SearchParser/autocompleteParser.js
index 3f3d7a740d60..3784d0666ce2 100644
--- a/src/libs/SearchParser/autocompleteParser.js
+++ b/src/libs/SearchParser/autocompleteParser.js
@@ -244,53 +244,59 @@ function peg$parse(input, options) {
   var peg$c58 = "limit";
   var peg$c59 = "feed";
   var peg$c60 = "title";
-  var peg$c61 = "assignee";
-  var peg$c62 = "createdby";
-  var peg$c63 = "created-by";
-  var peg$c64 = "action";
-  var peg$c65 = "total";
-  var peg$c66 = "has";
-  var peg$c67 = "is";
-  var peg$c68 = "purchaseamount";
-  var peg$c69 = "purchase-amount";
-  var peg$c70 = "purchasecurrency";
-  var peg$c71 = "purchase-currency";
-  var peg$c72 = "columns";
-  var peg$c73 = "view";
-  var peg$c74 = "per-diem";
-  var peg$c75 = "drafts";
-  var peg$c76 = "draft";
-  var peg$c77 = "tax";
-  var peg$c78 = "policy-name";
-  var peg$c79 = "long-report-id";
-  var peg$c80 = "exported-to";
-  var peg$c81 = "exportedto";
-  var peg$c82 = "exchange-rate";
-  var peg$c83 = "reimbursable-total";
-  var peg$c84 = "non-reimbursable-total";
-  var peg$c85 = "group-from";
-  var peg$c86 = "group-expenses";
-  var peg$c87 = "group-total";
-  var peg$c88 = "group-card";
-  var peg$c89 = "group-feed";
-  var peg$c90 = "group-bank-account";
-  var peg$c91 = "group-withdrawn";
-  var peg$c92 = "group-withdrawal-id";
-  var peg$c93 = "group-category";
-  var peg$c94 = "group-tag";
-  var peg$c95 = "group-merchant";
-  var peg$c96 = "group-month";
-  var peg$c97 = "group-week";
-  var peg$c98 = "group-year";
-  var peg$c99 = "group-quarter";
-  var peg$c100 = "!=";
-  var peg$c101 = ">=";
-  var peg$c102 = ">";
-  var peg$c103 = "<=";
-  var peg$c104 = "<";
-  var peg$c105 = "\u201C";
-  var peg$c106 = "\u201D";
-  var peg$c107 = "\"";
+  var peg$c61 = "submitteruserid";
+  var peg$c62 = "submitter-user-id";
+  var peg$c63 = "submitterpayrollid";
+  var peg$c64 = "submitter-payroll-id";
+  var peg$c65 = "orderdealnumbers";
+  var peg$c66 = "order-deal-numbers";
+  var peg$c67 = "assignee";
+  var peg$c68 = "createdby";
+  var peg$c69 = "created-by";
+  var peg$c70 = "action";
+  var peg$c71 = "total";
+  var peg$c72 = "has";
+  var peg$c73 = "is";
+  var peg$c74 = "purchaseamount";
+  var peg$c75 = "purchase-amount";
+  var peg$c76 = "purchasecurrency";
+  var peg$c77 = "purchase-currency";
+  var peg$c78 = "columns";
+  var peg$c79 = "view";
+  var peg$c80 = "per-diem";
+  var peg$c81 = "drafts";
+  var peg$c82 = "draft";
+  var peg$c83 = "tax";
+  var peg$c84 = "policy-name";
+  var peg$c85 = "long-report-id";
+  var peg$c86 = "exported-to";
+  var peg$c87 = "exportedto";
+  var peg$c88 = "exchange-rate";
+  var peg$c89 = "reimbursable-total";
+  var peg$c90 = "non-reimbursable-total";
+  var peg$c91 = "group-from";
+  var peg$c92 = "group-expenses";
+  var peg$c93 = "group-total";
+  var peg$c94 = "group-card";
+  var peg$c95 = "group-feed";
+  var peg$c96 = "group-bank-account";
+  var peg$c97 = "group-withdrawn";
+  var peg$c98 = "group-withdrawal-id";
+  var peg$c99 = "group-category";
+  var peg$c100 = "group-tag";
+  var peg$c101 = "group-merchant";
+  var peg$c102 = "group-month";
+  var peg$c103 = "group-week";
+  var peg$c104 = "group-year";
+  var peg$c105 = "group-quarter";
+  var peg$c106 = "!=";
+  var peg$c107 = ">=";
+  var peg$c108 = ">";
+  var peg$c109 = "<=";
+  var peg$c110 = "<";
+  var peg$c111 = "\u201C";
+  var peg$c112 = "\u201D";
+  var peg$c113 = "\"";
 
   var peg$r0 = /^[ \t\r\n\xA0,:=<>!]/;
   var peg$r1 = /^[:=]/;
@@ -370,69 +376,75 @@ function peg$parse(input, options) {
   var peg$e61 = peg$literalExpectation("limit", true);
   var peg$e62 = peg$literalExpectation("feed", true);
   var peg$e63 = peg$literalExpectation("title", true);
-  var peg$e64 = peg$literalExpectation("assignee", true);
-  var peg$e65 = peg$literalExpectation("createdBy", true);
-  var peg$e66 = peg$literalExpectation("created-by", true);
-  var peg$e67 = peg$literalExpectation("action", true);
-  var peg$e68 = peg$literalExpectation("total", true);
-  var peg$e69 = peg$literalExpectation("has", true);
-  var peg$e70 = peg$literalExpectation("is", true);
-  var peg$e71 = peg$literalExpectation("purchaseAmount", true);
-  var peg$e72 = peg$literalExpectation("purchase-amount", true);
-  var peg$e73 = peg$literalExpectation("purchaseCurrency", true);
-  var peg$e74 = peg$literalExpectation("purchase-currency", true);
-  var peg$e75 = peg$literalExpectation("columns", true);
-  var peg$e76 = peg$literalExpectation("view", true);
-  var peg$e77 = peg$literalExpectation("per-diem", true);
-  var peg$e78 = peg$literalExpectation("drafts", true);
-  var peg$e79 = peg$literalExpectation("draft", true);
-  var peg$e80 = peg$literalExpectation("tax", true);
-  var peg$e81 = peg$literalExpectation("policy-name", true);
-  var peg$e82 = peg$literalExpectation("long-report-id", true);
-  var peg$e83 = peg$literalExpectation("exported-to", true);
-  var peg$e84 = peg$classExpectation([":", "="], false, false);
-  var peg$e85 = peg$literalExpectation("exportedTo", true);
-  var peg$e86 = peg$literalExpectation("exchange-rate", true);
-  var peg$e87 = peg$literalExpectation("reimbursable-total", true);
-  var peg$e88 = peg$literalExpectation("non-reimbursable-total", true);
-  var peg$e89 = peg$literalExpectation("group-from", true);
-  var peg$e90 = peg$literalExpectation("group-expenses", true);
-  var peg$e91 = peg$literalExpectation("group-total", true);
-  var peg$e92 = peg$literalExpectation("group-card", true);
-  var peg$e93 = peg$literalExpectation("group-feed", true);
-  var peg$e94 = peg$literalExpectation("group-bank-account", true);
-  var peg$e95 = peg$literalExpectation("group-withdrawn", true);
-  var peg$e96 = peg$literalExpectation("group-withdrawal-id", true);
-  var peg$e97 = peg$literalExpectation("group-category", true);
-  var peg$e98 = peg$literalExpectation("group-tag", true);
-  var peg$e99 = peg$literalExpectation("group-merchant", true);
-  var peg$e100 = peg$literalExpectation("group-month", true);
-  var peg$e101 = peg$literalExpectation("group-week", true);
-  var peg$e102 = peg$literalExpectation("group-year", true);
-  var peg$e103 = peg$literalExpectation("group-quarter", true);
-  var peg$e104 = peg$otherExpectation("operator");
-  var peg$e105 = peg$literalExpectation("!=", false);
-  var peg$e106 = peg$literalExpectation(">=", false);
-  var peg$e107 = peg$literalExpectation(">", false);
-  var peg$e108 = peg$literalExpectation("<=", false);
-  var peg$e109 = peg$literalExpectation("<", false);
-  var peg$e110 = peg$otherExpectation("word");
-  var peg$e111 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e112 = peg$otherExpectation("whitespace");
-  var peg$e113 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
-  var peg$e114 = peg$otherExpectation("quote");
-  var peg$e115 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e116 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
-  var peg$e117 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
-  var peg$e118 = peg$literalExpectation("\u201C", false);
-  var peg$e119 = peg$literalExpectation("\u201D", false);
-  var peg$e120 = peg$literalExpectation("\"", false);
-  var peg$e121 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e122 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e123 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
-  var peg$e124 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
-  var peg$e125 = peg$classExpectation([","], false, false);
-  var peg$e126 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false);
+  var peg$e64 = peg$literalExpectation("submitterUserID", true);
+  var peg$e65 = peg$literalExpectation("submitter-user-id", true);
+  var peg$e66 = peg$literalExpectation("submitterPayrollID", true);
+  var peg$e67 = peg$literalExpectation("submitter-payroll-id", true);
+  var peg$e68 = peg$literalExpectation("orderDealNumbers", true);
+  var peg$e69 = peg$literalExpectation("order-deal-numbers", true);
+  var peg$e70 = peg$literalExpectation("assignee", true);
+  var peg$e71 = peg$literalExpectation("createdBy", true);
+  var peg$e72 = peg$literalExpectation("created-by", true);
+  var peg$e73 = peg$literalExpectation("action", true);
+  var peg$e74 = peg$literalExpectation("total", true);
+  var peg$e75 = peg$literalExpectation("has", true);
+  var peg$e76 = peg$literalExpectation("is", true);
+  var peg$e77 = peg$literalExpectation("purchaseAmount", true);
+  var peg$e78 = peg$literalExpectation("purchase-amount", true);
+  var peg$e79 = peg$literalExpectation("purchaseCurrency", true);
+  var peg$e80 = peg$literalExpectation("purchase-currency", true);
+  var peg$e81 = peg$literalExpectation("columns", true);
+  var peg$e82 = peg$literalExpectation("view", true);
+  var peg$e83 = peg$literalExpectation("per-diem", true);
+  var peg$e84 = peg$literalExpectation("drafts", true);
+  var peg$e85 = peg$literalExpectation("draft", true);
+  var peg$e86 = peg$literalExpectation("tax", true);
+  var peg$e87 = peg$literalExpectation("policy-name", true);
+  var peg$e88 = peg$literalExpectation("long-report-id", true);
+  var peg$e89 = peg$literalExpectation("exported-to", true);
+  var peg$e90 = peg$classExpectation([":", "="], false, false);
+  var peg$e91 = peg$literalExpectation("exportedTo", true);
+  var peg$e92 = peg$literalExpectation("exchange-rate", true);
+  var peg$e93 = peg$literalExpectation("reimbursable-total", true);
+  var peg$e94 = peg$literalExpectation("non-reimbursable-total", true);
+  var peg$e95 = peg$literalExpectation("group-from", true);
+  var peg$e96 = peg$literalExpectation("group-expenses", true);
+  var peg$e97 = peg$literalExpectation("group-total", true);
+  var peg$e98 = peg$literalExpectation("group-card", true);
+  var peg$e99 = peg$literalExpectation("group-feed", true);
+  var peg$e100 = peg$literalExpectation("group-bank-account", true);
+  var peg$e101 = peg$literalExpectation("group-withdrawn", true);
+  var peg$e102 = peg$literalExpectation("group-withdrawal-id", true);
+  var peg$e103 = peg$literalExpectation("group-category", true);
+  var peg$e104 = peg$literalExpectation("group-tag", true);
+  var peg$e105 = peg$literalExpectation("group-merchant", true);
+  var peg$e106 = peg$literalExpectation("group-month", true);
+  var peg$e107 = peg$literalExpectation("group-week", true);
+  var peg$e108 = peg$literalExpectation("group-year", true);
+  var peg$e109 = peg$literalExpectation("group-quarter", true);
+  var peg$e110 = peg$otherExpectation("operator");
+  var peg$e111 = peg$literalExpectation("!=", false);
+  var peg$e112 = peg$literalExpectation(">=", false);
+  var peg$e113 = peg$literalExpectation(">", false);
+  var peg$e114 = peg$literalExpectation("<=", false);
+  var peg$e115 = peg$literalExpectation("<", false);
+  var peg$e116 = peg$otherExpectation("word");
+  var peg$e117 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e118 = peg$otherExpectation("whitespace");
+  var peg$e119 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
+  var peg$e120 = peg$otherExpectation("quote");
+  var peg$e121 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e122 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
+  var peg$e123 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
+  var peg$e124 = peg$literalExpectation("\u201C", false);
+  var peg$e125 = peg$literalExpectation("\u201D", false);
+  var peg$e126 = peg$literalExpectation("\"", false);
+  var peg$e127 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e128 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e129 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
+  var peg$e130 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
+  var peg$e131 = peg$classExpectation([","], false, false);
+  var peg$e132 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false);
 
   var peg$f0 = function(ranges) { return { autocomplete, ranges }; };
   var peg$f1 = function(filters) { return filters.filter(Boolean).flat(); };
@@ -538,77 +550,80 @@ function peg$parse(input, options) {
   var peg$f46 = function() { return "limit"; };
   var peg$f47 = function() { return "feed"; };
   var peg$f48 = function() { return "title"; };
-  var peg$f49 = function() { return "assignee"; };
-  var peg$f50 = function() { return "createdBy"; };
-  var peg$f51 = function() { return "action"; };
-  var peg$f52 = function() {return "total"; };
-  var peg$f53 = function() {return "has"; };
-  var peg$f54 = function() {return "is"; };
-  var peg$f55 = function() {return "purchaseAmount"};
-  var peg$f56 = function() {return "purchaseCurrency"};
-  var peg$f57 = function() {
+  var peg$f49 = function() { return "submitterUserID"; };
+  var peg$f50 = function() { return "submitterPayrollID"; };
+  var peg$f51 = function() { return "orderDealNumbers"; };
+  var peg$f52 = function() { return "assignee"; };
+  var peg$f53 = function() { return "createdBy"; };
+  var peg$f54 = function() { return "action"; };
+  var peg$f55 = function() {return "total"; };
+  var peg$f56 = function() {return "has"; };
+  var peg$f57 = function() {return "is"; };
+  var peg$f58 = function() {return "purchaseAmount"};
+  var peg$f59 = function() {return "purchaseCurrency"};
+  var peg$f60 = function() {
   isColumnsContext = true;
   return "columns";
 };
-  var peg$f58 = function() {return "view"};
-  var peg$f59 = function() { return isColumnsContext; };
-  var peg$f60 = function() { return "perDiem"; };
-  var peg$f61 = function() { return "drafts"; };
-  var peg$f62 = function() { return "originalamount"; };
-  var peg$f63 = function() { return "taxAmount"; };
-  var peg$f64 = function() { return "taxrate"; };
-  var peg$f65 = function() { return "policyname"; };
-  var peg$f66 = function() { return "withdrawalID"; };
-  var peg$f67 = function() { return "bankAccount"; };
-  var peg$f68 = function() { return "reportID"; };
-  var peg$f69 = function() { return "base62ReportID"; };
-  var peg$f70 = function() { return "exportedto"; };
-  var peg$f71 = function() { return "exportedTo"; };
-  var peg$f72 = function() { return "exportedTo"; };
-  var peg$f73 = function() { return "exchangeRate"; };
-  var peg$f74 = function() { return "reimbursableTotal"; };
-  var peg$f75 = function() { return "nonReimbursableTotal"; };
-  var peg$f76 = function() { return "groupFrom"; };
-  var peg$f77 = function() { return "groupExpenses"; };
-  var peg$f78 = function() { return "groupTotal"; };
-  var peg$f79 = function() { return "groupCard"; };
-  var peg$f80 = function() { return "groupFeed"; };
-  var peg$f81 = function() { return "groupBankAccount"; };
-  var peg$f82 = function() { return "groupWithdrawn"; };
-  var peg$f83 = function() { return "groupWithdrawalID"; };
-  var peg$f84 = function() { return "groupCategory"; };
-  var peg$f85 = function() { return "groupTag"; };
-  var peg$f86 = function() { return "groupMerchant"; };
-  var peg$f87 = function() { return "groupmonth"; };
-  var peg$f88 = function() { return "groupweek"; };
-  var peg$f89 = function() { return "groupyear"; };
-  var peg$f90 = function() { return "groupquarter"; };
-  var peg$f91 = function() { return "eq"; };
-  var peg$f92 = function() { return "neq"; };
-  var peg$f93 = function() { return "gte"; };
-  var peg$f94 = function() { return "gt"; };
-  var peg$f95 = function() { return "lte"; };
-  var peg$f96 = function() { return "lt"; };
-  var peg$f97 = function(o) {
+  var peg$f61 = function() {return "view"};
+  var peg$f62 = function() { return isColumnsContext; };
+  var peg$f63 = function() { return "perDiem"; };
+  var peg$f64 = function() { return "drafts"; };
+  var peg$f65 = function() { return "originalamount"; };
+  var peg$f66 = function() { return "taxAmount"; };
+  var peg$f67 = function() { return "taxrate"; };
+  var peg$f68 = function() { return "policyname"; };
+  var peg$f69 = function() { return "withdrawalID"; };
+  var peg$f70 = function() { return "bankAccount"; };
+  var peg$f71 = function() { return "reportID"; };
+  var peg$f72 = function() { return "base62ReportID"; };
+  var peg$f73 = function() { return "exportedto"; };
+  var peg$f74 = function() { return "exportedTo"; };
+  var peg$f75 = function() { return "exportedTo"; };
+  var peg$f76 = function() { return "exchangeRate"; };
+  var peg$f77 = function() { return "reimbursableTotal"; };
+  var peg$f78 = function() { return "nonReimbursableTotal"; };
+  var peg$f79 = function() { return "groupFrom"; };
+  var peg$f80 = function() { return "groupExpenses"; };
+  var peg$f81 = function() { return "groupTotal"; };
+  var peg$f82 = function() { return "groupCard"; };
+  var peg$f83 = function() { return "groupFeed"; };
+  var peg$f84 = function() { return "groupBankAccount"; };
+  var peg$f85 = function() { return "groupWithdrawn"; };
+  var peg$f86 = function() { return "groupWithdrawalID"; };
+  var peg$f87 = function() { return "groupCategory"; };
+  var peg$f88 = function() { return "groupTag"; };
+  var peg$f89 = function() { return "groupMerchant"; };
+  var peg$f90 = function() { return "groupmonth"; };
+  var peg$f91 = function() { return "groupweek"; };
+  var peg$f92 = function() { return "groupyear"; };
+  var peg$f93 = function() { return "groupquarter"; };
+  var peg$f94 = function() { return "eq"; };
+  var peg$f95 = function() { return "neq"; };
+  var peg$f96 = function() { return "gte"; };
+  var peg$f97 = function() { return "gt"; };
+  var peg$f98 = function() { return "lte"; };
+  var peg$f99 = function() { return "lt"; };
+  var peg$f100 = function(o) {
       if (nameOperator) {
         expectingNestedQuote = (o === "eq"); // Use simple parser if no valid operator is found
       }
       isColumnsContext = false;
       return o;
   };
-  var peg$f98 = function(chars) { return chars.join("").trim(); };
-  var peg$f99 = function() { 
+  var peg$f101 = function(chars) { return chars.join("").trim(); };
+  var peg$f102 = function() { 
   isColumnsContext = false;
   return "and";
 };
-  var peg$f100 = function() { return expectingNestedQuote; };
-  var peg$f101 = function(start, inner, end) { //handle no-breaking space
+  var peg$f103 = function() { return expectingNestedQuote; };
+  var peg$f104 = function(start, inner, end) { //handle no-breaking space
       return [...start, '"', ...inner, '"', ...end].join("");
     };
-  var peg$f102 = function(start) {return "“"};
-  var peg$f103 = function(start) {return "”"};
-  var peg$f104 = function(start) {return "\""};
-  var peg$f105 = function(start, inner, end) {
+  var peg$f105 = function(start) {return "“"};
+  var peg$f106 = function(start) {return "”"};
+  var peg$f107 = function(start) {return "\""};
+  var peg$f108 = function(start, inner, end) {
     return [...start, '"', ...inner, '"'].join("");
 };
   var peg$currPos = options.peg$currPos | 0;
@@ -1117,11 +1132,20 @@ function peg$parse(input, options) {
                                                                                                 if (s1 === peg$FAILED) {
                                                                                                   s1 = peg$parsetitle();
                                                                                                   if (s1 === peg$FAILED) {
-                                                                                                    s1 = peg$parsereportFieldDynamic();
+                                                                                                    s1 = peg$parsesubmitterUserID();
                                                                                                     if (s1 === peg$FAILED) {
-                                                                                                      s1 = peg$parsecolumns();
+                                                                                                      s1 = peg$parsesubmitterPayrollID();
                                                                                                       if (s1 === peg$FAILED) {
-                                                                                                        s1 = peg$parselimit();
+                                                                                                        s1 = peg$parseorderDealNumbers();
+                                                                                                        if (s1 === peg$FAILED) {
+                                                                                                          s1 = peg$parsereportFieldDynamic();
+                                                                                                          if (s1 === peg$FAILED) {
+                                                                                                            s1 = peg$parsecolumns();
+                                                                                                            if (s1 === peg$FAILED) {
+                                                                                                              s1 = peg$parselimit();
+                                                                                                            }
+                                                                                                          }
+                                                                                                        }
                                                                                                       }
                                                                                                     }
                                                                                                   }
@@ -2238,20 +2262,107 @@ function peg$parse(input, options) {
     return s0;
   }
 
+  function peg$parsesubmitterUserID() {
+    var s0, s1;
+
+    s0 = input.substr(peg$currPos, 15);
+    if (s0.toLowerCase() === peg$c61) {
+      peg$currPos += 15;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e64); }
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 17);
+      if (s1.toLowerCase() === peg$c62) {
+        peg$currPos += 17;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e65); }
+      }
+      if (s1 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s1 = peg$f49();
+      }
+      s0 = s1;
+    }
+
+    return s0;
+  }
+
+  function peg$parsesubmitterPayrollID() {
+    var s0, s1;
+
+    s0 = input.substr(peg$currPos, 18);
+    if (s0.toLowerCase() === peg$c63) {
+      peg$currPos += 18;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e66); }
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 20);
+      if (s1.toLowerCase() === peg$c64) {
+        peg$currPos += 20;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e67); }
+      }
+      if (s1 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s1 = peg$f50();
+      }
+      s0 = s1;
+    }
+
+    return s0;
+  }
+
+  function peg$parseorderDealNumbers() {
+    var s0, s1;
+
+    s0 = input.substr(peg$currPos, 16);
+    if (s0.toLowerCase() === peg$c65) {
+      peg$currPos += 16;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e68); }
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 18);
+      if (s1.toLowerCase() === peg$c66) {
+        peg$currPos += 18;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e69); }
+      }
+      if (s1 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s1 = peg$f51();
+      }
+      s0 = s1;
+    }
+
+    return s0;
+  }
+
   function peg$parseassignee() {
     var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c61) {
+    if (s1.toLowerCase() === peg$c67) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e64); }
+      if (peg$silentFails === 0) { peg$fail(peg$e70); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f49();
+      s1 = peg$f52();
     }
     s0 = s1;
 
@@ -2262,24 +2373,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 9);
-    if (s0.toLowerCase() === peg$c62) {
+    if (s0.toLowerCase() === peg$c68) {
       peg$currPos += 9;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e65); }
+      if (peg$silentFails === 0) { peg$fail(peg$e71); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 10);
-      if (s1.toLowerCase() === peg$c63) {
+      if (s1.toLowerCase() === peg$c69) {
         peg$currPos += 10;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e66); }
+        if (peg$silentFails === 0) { peg$fail(peg$e72); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f50();
+        s1 = peg$f53();
       }
       s0 = s1;
     }
@@ -2292,15 +2403,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c64) {
+    if (s1.toLowerCase() === peg$c70) {
       peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e67); }
+      if (peg$silentFails === 0) { peg$fail(peg$e73); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f51();
+      s1 = peg$f54();
     }
     s0 = s1;
 
@@ -2312,15 +2423,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c65) {
+    if (s1.toLowerCase() === peg$c71) {
       peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e68); }
+      if (peg$silentFails === 0) { peg$fail(peg$e74); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f52();
+      s1 = peg$f55();
     }
     s0 = s1;
 
@@ -2332,15 +2443,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c66) {
+    if (s1.toLowerCase() === peg$c72) {
       peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e69); }
+      if (peg$silentFails === 0) { peg$fail(peg$e75); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f53();
+      s1 = peg$f56();
     }
     s0 = s1;
 
@@ -2352,15 +2463,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
-    if (s1.toLowerCase() === peg$c67) {
+    if (s1.toLowerCase() === peg$c73) {
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e70); }
+      if (peg$silentFails === 0) { peg$fail(peg$e76); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f54();
+      s1 = peg$f57();
     }
     s0 = s1;
 
@@ -2371,24 +2482,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 14);
-    if (s0.toLowerCase() === peg$c68) {
+    if (s0.toLowerCase() === peg$c74) {
       peg$currPos += 14;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e71); }
+      if (peg$silentFails === 0) { peg$fail(peg$e77); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 15);
-      if (s1.toLowerCase() === peg$c69) {
+      if (s1.toLowerCase() === peg$c75) {
         peg$currPos += 15;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e72); }
+        if (peg$silentFails === 0) { peg$fail(peg$e78); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f55();
+        s1 = peg$f58();
       }
       s0 = s1;
     }
@@ -2400,24 +2511,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 16);
-    if (s0.toLowerCase() === peg$c70) {
+    if (s0.toLowerCase() === peg$c76) {
       peg$currPos += 16;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e73); }
+      if (peg$silentFails === 0) { peg$fail(peg$e79); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 17);
-      if (s1.toLowerCase() === peg$c71) {
+      if (s1.toLowerCase() === peg$c77) {
         peg$currPos += 17;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e74); }
+        if (peg$silentFails === 0) { peg$fail(peg$e80); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f56();
+        s1 = peg$f59();
       }
       s0 = s1;
     }
@@ -2430,15 +2541,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 7);
-    if (s1.toLowerCase() === peg$c72) {
+    if (s1.toLowerCase() === peg$c78) {
       peg$currPos += 7;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e75); }
+      if (peg$silentFails === 0) { peg$fail(peg$e81); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f57();
+      s1 = peg$f60();
     }
     s0 = s1;
 
@@ -2450,15 +2561,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c73) {
+    if (s1.toLowerCase() === peg$c79) {
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e76); }
+      if (peg$silentFails === 0) { peg$fail(peg$e82); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f58();
+      s1 = peg$f61();
     }
     s0 = s1;
 
@@ -2470,7 +2581,7 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
-    s1 = peg$f59();
+    s1 = peg$f62();
     if (s1) {
       s1 = undefined;
     } else {
@@ -2590,11 +2701,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c74) {
+    if (s1.toLowerCase() === peg$c80) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e77); }
+      if (peg$silentFails === 0) { peg$fail(peg$e83); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -2609,7 +2720,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f60();
+        s0 = peg$f63();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2627,19 +2738,19 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c75) {
+    if (s1.toLowerCase() === peg$c81) {
       peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e78); }
+      if (peg$silentFails === 0) { peg$fail(peg$e84); }
     }
     if (s1 === peg$FAILED) {
       s1 = input.substr(peg$currPos, 5);
-      if (s1.toLowerCase() === peg$c76) {
+      if (s1.toLowerCase() === peg$c82) {
         peg$currPos += 5;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e79); }
+        if (peg$silentFails === 0) { peg$fail(peg$e85); }
       }
     }
     if (s1 !== peg$FAILED) {
@@ -2655,7 +2766,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f61();
+        s0 = peg$f64();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2673,11 +2784,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 15);
-    if (s1.toLowerCase() === peg$c69) {
+    if (s1.toLowerCase() === peg$c75) {
       peg$currPos += 15;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e72); }
+      if (peg$silentFails === 0) { peg$fail(peg$e78); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -2692,7 +2803,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f62();
+        s0 = peg$f65();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2710,11 +2821,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c77) {
+    if (s1.toLowerCase() === peg$c83) {
       peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e80); }
+      if (peg$silentFails === 0) { peg$fail(peg$e86); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -2729,7 +2840,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f63();
+        s0 = peg$f66();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2766,7 +2877,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f64();
+        s0 = peg$f67();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2784,11 +2895,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c78) {
+    if (s1.toLowerCase() === peg$c84) {
       peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e81); }
+      if (peg$silentFails === 0) { peg$fail(peg$e87); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -2803,7 +2914,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f65();
+        s0 = peg$f68();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2840,7 +2951,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f66();
+        s0 = peg$f69();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2877,7 +2988,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f67();
+        s0 = peg$f70();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2895,11 +3006,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c79) {
+    if (s1.toLowerCase() === peg$c85) {
       peg$currPos += 14;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e82); }
+      if (peg$silentFails === 0) { peg$fail(peg$e88); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -2914,7 +3025,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f68();
+        s0 = peg$f71();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2951,7 +3062,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f69();
+        s0 = peg$f72();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2969,11 +3080,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c80) {
+    if (s1.toLowerCase() === peg$c86) {
       peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e83); }
+      if (peg$silentFails === 0) { peg$fail(peg$e89); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -2988,7 +3099,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f70();
+        s0 = peg$f73();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3013,7 +3124,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e84); }
+        if (peg$silentFails === 0) { peg$fail(peg$e90); }
       }
       if (s2 !== peg$FAILED) {
         s1 = [s1, s2];
@@ -3032,11 +3143,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c81) {
+    if (s1.toLowerCase() === peg$c87) {
       peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e85); }
+      if (peg$silentFails === 0) { peg$fail(peg$e91); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3051,7 +3162,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f71();
+        s0 = peg$f74();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3063,11 +3174,11 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 11);
-      if (s1.toLowerCase() === peg$c80) {
+      if (s1.toLowerCase() === peg$c86) {
         peg$currPos += 11;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e83); }
+        if (peg$silentFails === 0) { peg$fail(peg$e89); }
       }
       if (s1 !== peg$FAILED) {
         s2 = peg$currPos;
@@ -3082,7 +3193,7 @@ function peg$parse(input, options) {
         }
         if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f72();
+          s0 = peg$f75();
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -3101,11 +3212,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 13);
-    if (s1.toLowerCase() === peg$c82) {
+    if (s1.toLowerCase() === peg$c88) {
       peg$currPos += 13;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e86); }
+      if (peg$silentFails === 0) { peg$fail(peg$e92); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3120,7 +3231,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f73();
+        s0 = peg$f76();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3138,11 +3249,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 18);
-    if (s1.toLowerCase() === peg$c83) {
+    if (s1.toLowerCase() === peg$c89) {
       peg$currPos += 18;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e87); }
+      if (peg$silentFails === 0) { peg$fail(peg$e93); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3157,7 +3268,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f74();
+        s0 = peg$f77();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3175,11 +3286,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 22);
-    if (s1.toLowerCase() === peg$c84) {
+    if (s1.toLowerCase() === peg$c90) {
       peg$currPos += 22;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e88); }
+      if (peg$silentFails === 0) { peg$fail(peg$e94); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3194,7 +3305,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f75();
+        s0 = peg$f78();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3212,11 +3323,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c85) {
+    if (s1.toLowerCase() === peg$c91) {
       peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e89); }
+      if (peg$silentFails === 0) { peg$fail(peg$e95); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3231,7 +3342,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f76();
+        s0 = peg$f79();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3249,11 +3360,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c86) {
+    if (s1.toLowerCase() === peg$c92) {
       peg$currPos += 14;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e90); }
+      if (peg$silentFails === 0) { peg$fail(peg$e96); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3268,7 +3379,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f77();
+        s0 = peg$f80();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3286,11 +3397,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c87) {
+    if (s1.toLowerCase() === peg$c93) {
       peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e91); }
+      if (peg$silentFails === 0) { peg$fail(peg$e97); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3305,7 +3416,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f78();
+        s0 = peg$f81();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3323,11 +3434,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c88) {
+    if (s1.toLowerCase() === peg$c94) {
       peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e92); }
+      if (peg$silentFails === 0) { peg$fail(peg$e98); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3342,7 +3453,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f79();
+        s0 = peg$f82();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3360,11 +3471,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c89) {
+    if (s1.toLowerCase() === peg$c95) {
       peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e93); }
+      if (peg$silentFails === 0) { peg$fail(peg$e99); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3379,7 +3490,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f80();
+        s0 = peg$f83();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3397,11 +3508,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 18);
-    if (s1.toLowerCase() === peg$c90) {
+    if (s1.toLowerCase() === peg$c96) {
       peg$currPos += 18;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e94); }
+      if (peg$silentFails === 0) { peg$fail(peg$e100); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3416,7 +3527,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f81();
+        s0 = peg$f84();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3434,11 +3545,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 15);
-    if (s1.toLowerCase() === peg$c91) {
+    if (s1.toLowerCase() === peg$c97) {
       peg$currPos += 15;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e95); }
+      if (peg$silentFails === 0) { peg$fail(peg$e101); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3453,7 +3564,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f82();
+        s0 = peg$f85();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3471,11 +3582,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 19);
-    if (s1.toLowerCase() === peg$c92) {
+    if (s1.toLowerCase() === peg$c98) {
       peg$currPos += 19;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e96); }
+      if (peg$silentFails === 0) { peg$fail(peg$e102); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3490,7 +3601,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f83();
+        s0 = peg$f86();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3508,11 +3619,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c93) {
+    if (s1.toLowerCase() === peg$c99) {
       peg$currPos += 14;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e97); }
+      if (peg$silentFails === 0) { peg$fail(peg$e103); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3527,7 +3638,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f84();
+        s0 = peg$f87();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3545,11 +3656,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c94) {
+    if (s1.toLowerCase() === peg$c100) {
       peg$currPos += 9;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e98); }
+      if (peg$silentFails === 0) { peg$fail(peg$e104); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3564,7 +3675,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f85();
+        s0 = peg$f88();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3582,11 +3693,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c95) {
+    if (s1.toLowerCase() === peg$c101) {
       peg$currPos += 14;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e99); }
+      if (peg$silentFails === 0) { peg$fail(peg$e105); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3601,7 +3712,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f86();
+        s0 = peg$f89();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3619,11 +3730,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c96) {
+    if (s1.toLowerCase() === peg$c102) {
       peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e100); }
+      if (peg$silentFails === 0) { peg$fail(peg$e106); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3638,7 +3749,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f87();
+        s0 = peg$f90();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3656,11 +3767,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c97) {
+    if (s1.toLowerCase() === peg$c103) {
       peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e101); }
+      if (peg$silentFails === 0) { peg$fail(peg$e107); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3675,7 +3786,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f88();
+        s0 = peg$f91();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3693,11 +3804,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c98) {
+    if (s1.toLowerCase() === peg$c104) {
       peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e102); }
+      if (peg$silentFails === 0) { peg$fail(peg$e108); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3712,7 +3823,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f89();
+        s0 = peg$f92();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3730,11 +3841,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 13);
-    if (s1.toLowerCase() === peg$c99) {
+    if (s1.toLowerCase() === peg$c105) {
       peg$currPos += 13;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e103); }
+      if (peg$silentFails === 0) { peg$fail(peg$e109); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3749,7 +3860,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f90();
+        s0 = peg$f93();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3772,81 +3883,81 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e84); }
+      if (peg$silentFails === 0) { peg$fail(peg$e90); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f91();
+      s1 = peg$f94();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c100) {
-        s1 = peg$c100;
+      if (input.substr(peg$currPos, 2) === peg$c106) {
+        s1 = peg$c106;
         peg$currPos += 2;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e105); }
+        if (peg$silentFails === 0) { peg$fail(peg$e111); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f92();
+        s1 = peg$f95();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 2) === peg$c101) {
-          s1 = peg$c101;
+        if (input.substr(peg$currPos, 2) === peg$c107) {
+          s1 = peg$c107;
           peg$currPos += 2;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e106); }
+          if (peg$silentFails === 0) { peg$fail(peg$e112); }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f93();
+          s1 = peg$f96();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
           if (input.charCodeAt(peg$currPos) === 62) {
-            s1 = peg$c102;
+            s1 = peg$c108;
             peg$currPos++;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e107); }
+            if (peg$silentFails === 0) { peg$fail(peg$e113); }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$f94();
+            s1 = peg$f97();
           }
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 2) === peg$c103) {
-              s1 = peg$c103;
+            if (input.substr(peg$currPos, 2) === peg$c109) {
+              s1 = peg$c109;
               peg$currPos += 2;
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e108); }
+              if (peg$silentFails === 0) { peg$fail(peg$e114); }
             }
             if (s1 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$f95();
+              s1 = peg$f98();
             }
             s0 = s1;
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
               if (input.charCodeAt(peg$currPos) === 60) {
-                s1 = peg$c104;
+                s1 = peg$c110;
                 peg$currPos++;
               } else {
                 s1 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e109); }
+                if (peg$silentFails === 0) { peg$fail(peg$e115); }
               }
               if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$f96();
+                s1 = peg$f99();
               }
               s0 = s1;
             }
@@ -3857,7 +3968,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e104); }
+      if (peg$silentFails === 0) { peg$fail(peg$e110); }
     }
 
     return s0;
@@ -3870,7 +3981,7 @@ function peg$parse(input, options) {
     s1 = peg$parseoperator();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f97(s1);
+      s1 = peg$f100(s1);
     }
     s0 = s1;
 
@@ -3888,7 +3999,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e111); }
+      if (peg$silentFails === 0) { peg$fail(peg$e117); }
     }
     if (s2 !== peg$FAILED) {
       while (s2 !== peg$FAILED) {
@@ -3898,7 +4009,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e111); }
+          if (peg$silentFails === 0) { peg$fail(peg$e117); }
         }
       }
     } else {
@@ -3906,13 +4017,13 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f98(s1);
+      s1 = peg$f101(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e110); }
+      if (peg$silentFails === 0) { peg$fail(peg$e116); }
     }
 
     return s0;
@@ -3924,7 +4035,7 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$parse_();
     peg$savedPos = s0;
-    s1 = peg$f99();
+    s1 = peg$f102();
     s0 = s1;
 
     return s0;
@@ -3940,7 +4051,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e113); }
+      if (peg$silentFails === 0) { peg$fail(peg$e119); }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
@@ -3949,12 +4060,12 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e113); }
+        if (peg$silentFails === 0) { peg$fail(peg$e119); }
       }
     }
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e112); }
+    if (peg$silentFails === 0) { peg$fail(peg$e118); }
 
     return s0;
   }
@@ -3964,7 +4075,7 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
-    s1 = peg$f100();
+    s1 = peg$f103();
     if (s1) {
       s1 = undefined;
     } else {
@@ -4001,7 +4112,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e115); }
+      if (peg$silentFails === 0) { peg$fail(peg$e121); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -4010,7 +4121,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e115); }
+        if (peg$silentFails === 0) { peg$fail(peg$e121); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -4018,7 +4129,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e116); }
+      if (peg$silentFails === 0) { peg$fail(peg$e122); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -4027,7 +4138,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e117); }
+        if (peg$silentFails === 0) { peg$fail(peg$e123); }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
@@ -4036,7 +4147,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e117); }
+          if (peg$silentFails === 0) { peg$fail(peg$e123); }
         }
       }
       s4 = input.charAt(peg$currPos);
@@ -4044,7 +4155,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e116); }
+        if (peg$silentFails === 0) { peg$fail(peg$e122); }
       }
       if (s4 !== peg$FAILED) {
         s5 = [];
@@ -4053,7 +4164,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e111); }
+          if (peg$silentFails === 0) { peg$fail(peg$e117); }
         }
         while (s6 !== peg$FAILED) {
           s5.push(s6);
@@ -4062,11 +4173,11 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e111); }
+            if (peg$silentFails === 0) { peg$fail(peg$e117); }
           }
         }
         peg$savedPos = s0;
-        s0 = peg$f101(s1, s3, s5);
+        s0 = peg$f104(s1, s3, s5);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4078,7 +4189,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e114); }
+      if (peg$silentFails === 0) { peg$fail(peg$e120); }
     }
 
     return s0;
@@ -4095,7 +4206,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e115); }
+      if (peg$silentFails === 0) { peg$fail(peg$e121); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -4104,7 +4215,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e115); }
+        if (peg$silentFails === 0) { peg$fail(peg$e121); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -4112,7 +4223,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e116); }
+      if (peg$silentFails === 0) { peg$fail(peg$e122); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -4121,7 +4232,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e117); }
+        if (peg$silentFails === 0) { peg$fail(peg$e123); }
       }
       if (s4 === peg$FAILED) {
         s4 = peg$currPos;
@@ -4137,15 +4248,15 @@ function peg$parse(input, options) {
         }
         if (s5 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 8220) {
-            s6 = peg$c105;
+            s6 = peg$c111;
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e118); }
+            if (peg$silentFails === 0) { peg$fail(peg$e124); }
           }
           if (s6 !== peg$FAILED) {
             peg$savedPos = s4;
-            s4 = peg$f102(s1);
+            s4 = peg$f105(s1);
           } else {
             peg$currPos = s4;
             s4 = peg$FAILED;
@@ -4168,15 +4279,15 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8221) {
-              s6 = peg$c106;
+              s6 = peg$c112;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e119); }
+              if (peg$silentFails === 0) { peg$fail(peg$e125); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f103(s1);
+              s4 = peg$f106(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -4199,15 +4310,15 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 34) {
-                s6 = peg$c107;
+                s6 = peg$c113;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e120); }
+                if (peg$silentFails === 0) { peg$fail(peg$e126); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f104(s1);
+                s4 = peg$f107(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -4226,7 +4337,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e117); }
+          if (peg$silentFails === 0) { peg$fail(peg$e123); }
         }
         if (s4 === peg$FAILED) {
           s4 = peg$currPos;
@@ -4242,15 +4353,15 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8220) {
-              s6 = peg$c105;
+              s6 = peg$c111;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e118); }
+              if (peg$silentFails === 0) { peg$fail(peg$e124); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f102(s1);
+              s4 = peg$f105(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -4273,15 +4384,15 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 8221) {
-                s6 = peg$c106;
+                s6 = peg$c112;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e119); }
+                if (peg$silentFails === 0) { peg$fail(peg$e125); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f103(s1);
+                s4 = peg$f106(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -4304,15 +4415,15 @@ function peg$parse(input, options) {
               }
               if (s5 !== peg$FAILED) {
                 if (input.charCodeAt(peg$currPos) === 34) {
-                  s6 = peg$c107;
+                  s6 = peg$c113;
                   peg$currPos++;
                 } else {
                   s6 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e120); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e126); }
                 }
                 if (s6 !== peg$FAILED) {
                   peg$savedPos = s4;
-                  s4 = peg$f104(s1);
+                  s4 = peg$f107(s1);
                 } else {
                   peg$currPos = s4;
                   s4 = peg$FAILED;
@@ -4328,7 +4439,7 @@ function peg$parse(input, options) {
       s4 = peg$parseclosingQuote();
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f105(s1, s3, s4);
+        s0 = peg$f108(s1, s3, s4);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4340,7 +4451,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e114); }
+      if (peg$silentFails === 0) { peg$fail(peg$e120); }
     }
 
     return s0;
@@ -4355,7 +4466,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e116); }
+      if (peg$silentFails === 0) { peg$fail(peg$e122); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4393,7 +4504,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e121); }
+      if (peg$silentFails === 0) { peg$fail(peg$e127); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -4402,7 +4513,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e121); }
+        if (peg$silentFails === 0) { peg$fail(peg$e127); }
       }
     }
     s2 = [];
@@ -4411,7 +4522,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s3 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e122); }
+      if (peg$silentFails === 0) { peg$fail(peg$e128); }
     }
     while (s3 !== peg$FAILED) {
       s2.push(s3);
@@ -4420,7 +4531,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e122); }
+        if (peg$silentFails === 0) { peg$fail(peg$e128); }
       }
     }
     s3 = [];
@@ -4429,7 +4540,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s4 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e123); }
+      if (peg$silentFails === 0) { peg$fail(peg$e129); }
     }
     while (s4 !== peg$FAILED) {
       s3.push(s4);
@@ -4438,7 +4549,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e123); }
+        if (peg$silentFails === 0) { peg$fail(peg$e129); }
       }
     }
     s4 = peg$parseoperator();
@@ -4457,7 +4568,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e124); }
+        if (peg$silentFails === 0) { peg$fail(peg$e130); }
       }
       while (s2 !== peg$FAILED) {
         s1.push(s2);
@@ -4466,7 +4577,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e124); }
+          if (peg$silentFails === 0) { peg$fail(peg$e130); }
         }
       }
       s2 = peg$currPos;
@@ -4513,7 +4624,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e125); }
+          if (peg$silentFails === 0) { peg$fail(peg$e131); }
         }
       }
     }
@@ -4529,7 +4640,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e126); }
+      if (peg$silentFails === 0) { peg$fail(peg$e132); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
diff --git a/src/libs/SearchParser/autocompleteParser.peggy b/src/libs/SearchParser/autocompleteParser.peggy
index 9efaadf55527..885f0cf30bfa 100644
--- a/src/libs/SearchParser/autocompleteParser.peggy
+++ b/src/libs/SearchParser/autocompleteParser.peggy
@@ -123,6 +123,9 @@ autocompleteKey "key"
       / reportID
       / withdrawalID
       / title
+      / submitterUserID
+      / submitterPayrollID
+      / orderDealNumbers
       / reportFieldDynamic
       / columns
       / limit
diff --git a/src/libs/SearchParser/baseRules.peggy b/src/libs/SearchParser/baseRules.peggy
index a6afcc350bfa..60e1c33290fa 100644
--- a/src/libs/SearchParser/baseRules.peggy
+++ b/src/libs/SearchParser/baseRules.peggy
@@ -84,6 +84,9 @@ groupBy = "groupBy"i / "group-by"i { return "groupBy"; }
 limit = "limit"i { return "limit"; }
 feed = "feed"i { return "feed"; }
 title = "title"i { return "title"; }
+submitterUserID = "submitterUserID"i / "submitter-user-id"i { return "submitterUserID"; }
+submitterPayrollID = "submitterPayrollID"i / "submitter-payroll-id"i { return "submitterPayrollID"; }
+orderDealNumbers = "orderDealNumbers"i / "order-deal-numbers"i { return "orderDealNumbers"; }
 assignee = "assignee"i { return "assignee"; }
 createdBy = "createdBy"i  / "created-by"i { return "createdBy"; }
 action = "action"i { return "action"; }
diff --git a/src/libs/SearchParser/searchParser.js b/src/libs/SearchParser/searchParser.js
index 23ce77c8a6ee..5fd114076e1c 100644
--- a/src/libs/SearchParser/searchParser.js
+++ b/src/libs/SearchParser/searchParser.js
@@ -245,53 +245,59 @@ function peg$parse(input, options) {
   var peg$c58 = "limit";
   var peg$c59 = "feed";
   var peg$c60 = "title";
-  var peg$c61 = "assignee";
-  var peg$c62 = "createdby";
-  var peg$c63 = "created-by";
-  var peg$c64 = "action";
-  var peg$c65 = "total";
-  var peg$c66 = "has";
-  var peg$c67 = "is";
-  var peg$c68 = "purchaseamount";
-  var peg$c69 = "purchase-amount";
-  var peg$c70 = "purchasecurrency";
-  var peg$c71 = "purchase-currency";
-  var peg$c72 = "columns";
-  var peg$c73 = "view";
-  var peg$c74 = "per-diem";
-  var peg$c75 = "drafts";
-  var peg$c76 = "draft";
-  var peg$c77 = "tax";
-  var peg$c78 = "policy-name";
-  var peg$c79 = "long-report-id";
-  var peg$c80 = "exported-to";
-  var peg$c81 = "exportedto";
-  var peg$c82 = "exchange-rate";
-  var peg$c83 = "reimbursable-total";
-  var peg$c84 = "non-reimbursable-total";
-  var peg$c85 = "group-from";
-  var peg$c86 = "group-expenses";
-  var peg$c87 = "group-total";
-  var peg$c88 = "group-card";
-  var peg$c89 = "group-feed";
-  var peg$c90 = "group-bank-account";
-  var peg$c91 = "group-withdrawn";
-  var peg$c92 = "group-withdrawal-id";
-  var peg$c93 = "group-category";
-  var peg$c94 = "group-tag";
-  var peg$c95 = "group-merchant";
-  var peg$c96 = "group-month";
-  var peg$c97 = "group-week";
-  var peg$c98 = "group-year";
-  var peg$c99 = "group-quarter";
-  var peg$c100 = "!=";
-  var peg$c101 = ">=";
-  var peg$c102 = ">";
-  var peg$c103 = "<=";
-  var peg$c104 = "<";
-  var peg$c105 = "\u201C";
-  var peg$c106 = "\u201D";
-  var peg$c107 = "\"";
+  var peg$c61 = "submitteruserid";
+  var peg$c62 = "submitter-user-id";
+  var peg$c63 = "submitterpayrollid";
+  var peg$c64 = "submitter-payroll-id";
+  var peg$c65 = "orderdealnumbers";
+  var peg$c66 = "order-deal-numbers";
+  var peg$c67 = "assignee";
+  var peg$c68 = "createdby";
+  var peg$c69 = "created-by";
+  var peg$c70 = "action";
+  var peg$c71 = "total";
+  var peg$c72 = "has";
+  var peg$c73 = "is";
+  var peg$c74 = "purchaseamount";
+  var peg$c75 = "purchase-amount";
+  var peg$c76 = "purchasecurrency";
+  var peg$c77 = "purchase-currency";
+  var peg$c78 = "columns";
+  var peg$c79 = "view";
+  var peg$c80 = "per-diem";
+  var peg$c81 = "drafts";
+  var peg$c82 = "draft";
+  var peg$c83 = "tax";
+  var peg$c84 = "policy-name";
+  var peg$c85 = "long-report-id";
+  var peg$c86 = "exported-to";
+  var peg$c87 = "exportedto";
+  var peg$c88 = "exchange-rate";
+  var peg$c89 = "reimbursable-total";
+  var peg$c90 = "non-reimbursable-total";
+  var peg$c91 = "group-from";
+  var peg$c92 = "group-expenses";
+  var peg$c93 = "group-total";
+  var peg$c94 = "group-card";
+  var peg$c95 = "group-feed";
+  var peg$c96 = "group-bank-account";
+  var peg$c97 = "group-withdrawn";
+  var peg$c98 = "group-withdrawal-id";
+  var peg$c99 = "group-category";
+  var peg$c100 = "group-tag";
+  var peg$c101 = "group-merchant";
+  var peg$c102 = "group-month";
+  var peg$c103 = "group-week";
+  var peg$c104 = "group-year";
+  var peg$c105 = "group-quarter";
+  var peg$c106 = "!=";
+  var peg$c107 = ">=";
+  var peg$c108 = ">";
+  var peg$c109 = "<=";
+  var peg$c110 = "<";
+  var peg$c111 = "\u201C";
+  var peg$c112 = "\u201D";
+  var peg$c113 = "\"";
 
   var peg$r0 = /^[^ \t\r\n\xA0]/;
   var peg$r1 = /^[ \t\r\n\xA0,:=<>!]/;
@@ -374,69 +380,75 @@ function peg$parse(input, options) {
   var peg$e63 = peg$literalExpectation("limit", true);
   var peg$e64 = peg$literalExpectation("feed", true);
   var peg$e65 = peg$literalExpectation("title", true);
-  var peg$e66 = peg$literalExpectation("assignee", true);
-  var peg$e67 = peg$literalExpectation("createdBy", true);
-  var peg$e68 = peg$literalExpectation("created-by", true);
-  var peg$e69 = peg$literalExpectation("action", true);
-  var peg$e70 = peg$literalExpectation("total", true);
-  var peg$e71 = peg$literalExpectation("has", true);
-  var peg$e72 = peg$literalExpectation("is", true);
-  var peg$e73 = peg$literalExpectation("purchaseAmount", true);
-  var peg$e74 = peg$literalExpectation("purchase-amount", true);
-  var peg$e75 = peg$literalExpectation("purchaseCurrency", true);
-  var peg$e76 = peg$literalExpectation("purchase-currency", true);
-  var peg$e77 = peg$literalExpectation("columns", true);
-  var peg$e78 = peg$literalExpectation("view", true);
-  var peg$e79 = peg$literalExpectation("per-diem", true);
-  var peg$e80 = peg$literalExpectation("drafts", true);
-  var peg$e81 = peg$literalExpectation("draft", true);
-  var peg$e82 = peg$literalExpectation("tax", true);
-  var peg$e83 = peg$literalExpectation("policy-name", true);
-  var peg$e84 = peg$literalExpectation("long-report-id", true);
-  var peg$e85 = peg$literalExpectation("exported-to", true);
-  var peg$e86 = peg$classExpectation([":", "="], false, false);
-  var peg$e87 = peg$literalExpectation("exportedTo", true);
-  var peg$e88 = peg$literalExpectation("exchange-rate", true);
-  var peg$e89 = peg$literalExpectation("reimbursable-total", true);
-  var peg$e90 = peg$literalExpectation("non-reimbursable-total", true);
-  var peg$e91 = peg$literalExpectation("group-from", true);
-  var peg$e92 = peg$literalExpectation("group-expenses", true);
-  var peg$e93 = peg$literalExpectation("group-total", true);
-  var peg$e94 = peg$literalExpectation("group-card", true);
-  var peg$e95 = peg$literalExpectation("group-feed", true);
-  var peg$e96 = peg$literalExpectation("group-bank-account", true);
-  var peg$e97 = peg$literalExpectation("group-withdrawn", true);
-  var peg$e98 = peg$literalExpectation("group-withdrawal-id", true);
-  var peg$e99 = peg$literalExpectation("group-category", true);
-  var peg$e100 = peg$literalExpectation("group-tag", true);
-  var peg$e101 = peg$literalExpectation("group-merchant", true);
-  var peg$e102 = peg$literalExpectation("group-month", true);
-  var peg$e103 = peg$literalExpectation("group-week", true);
-  var peg$e104 = peg$literalExpectation("group-year", true);
-  var peg$e105 = peg$literalExpectation("group-quarter", true);
-  var peg$e106 = peg$otherExpectation("operator");
-  var peg$e107 = peg$literalExpectation("!=", false);
-  var peg$e108 = peg$literalExpectation(">=", false);
-  var peg$e109 = peg$literalExpectation(">", false);
-  var peg$e110 = peg$literalExpectation("<=", false);
-  var peg$e111 = peg$literalExpectation("<", false);
-  var peg$e112 = peg$otherExpectation("word");
-  var peg$e113 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e114 = peg$otherExpectation("whitespace");
-  var peg$e115 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
-  var peg$e116 = peg$otherExpectation("quote");
-  var peg$e117 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e118 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
-  var peg$e119 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
-  var peg$e120 = peg$literalExpectation("\u201C", false);
-  var peg$e121 = peg$literalExpectation("\u201D", false);
-  var peg$e122 = peg$literalExpectation("\"", false);
-  var peg$e123 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e124 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e125 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
-  var peg$e126 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
-  var peg$e127 = peg$classExpectation([","], false, false);
-  var peg$e128 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false);
+  var peg$e66 = peg$literalExpectation("submitterUserID", true);
+  var peg$e67 = peg$literalExpectation("submitter-user-id", true);
+  var peg$e68 = peg$literalExpectation("submitterPayrollID", true);
+  var peg$e69 = peg$literalExpectation("submitter-payroll-id", true);
+  var peg$e70 = peg$literalExpectation("orderDealNumbers", true);
+  var peg$e71 = peg$literalExpectation("order-deal-numbers", true);
+  var peg$e72 = peg$literalExpectation("assignee", true);
+  var peg$e73 = peg$literalExpectation("createdBy", true);
+  var peg$e74 = peg$literalExpectation("created-by", true);
+  var peg$e75 = peg$literalExpectation("action", true);
+  var peg$e76 = peg$literalExpectation("total", true);
+  var peg$e77 = peg$literalExpectation("has", true);
+  var peg$e78 = peg$literalExpectation("is", true);
+  var peg$e79 = peg$literalExpectation("purchaseAmount", true);
+  var peg$e80 = peg$literalExpectation("purchase-amount", true);
+  var peg$e81 = peg$literalExpectation("purchaseCurrency", true);
+  var peg$e82 = peg$literalExpectation("purchase-currency", true);
+  var peg$e83 = peg$literalExpectation("columns", true);
+  var peg$e84 = peg$literalExpectation("view", true);
+  var peg$e85 = peg$literalExpectation("per-diem", true);
+  var peg$e86 = peg$literalExpectation("drafts", true);
+  var peg$e87 = peg$literalExpectation("draft", true);
+  var peg$e88 = peg$literalExpectation("tax", true);
+  var peg$e89 = peg$literalExpectation("policy-name", true);
+  var peg$e90 = peg$literalExpectation("long-report-id", true);
+  var peg$e91 = peg$literalExpectation("exported-to", true);
+  var peg$e92 = peg$classExpectation([":", "="], false, false);
+  var peg$e93 = peg$literalExpectation("exportedTo", true);
+  var peg$e94 = peg$literalExpectation("exchange-rate", true);
+  var peg$e95 = peg$literalExpectation("reimbursable-total", true);
+  var peg$e96 = peg$literalExpectation("non-reimbursable-total", true);
+  var peg$e97 = peg$literalExpectation("group-from", true);
+  var peg$e98 = peg$literalExpectation("group-expenses", true);
+  var peg$e99 = peg$literalExpectation("group-total", true);
+  var peg$e100 = peg$literalExpectation("group-card", true);
+  var peg$e101 = peg$literalExpectation("group-feed", true);
+  var peg$e102 = peg$literalExpectation("group-bank-account", true);
+  var peg$e103 = peg$literalExpectation("group-withdrawn", true);
+  var peg$e104 = peg$literalExpectation("group-withdrawal-id", true);
+  var peg$e105 = peg$literalExpectation("group-category", true);
+  var peg$e106 = peg$literalExpectation("group-tag", true);
+  var peg$e107 = peg$literalExpectation("group-merchant", true);
+  var peg$e108 = peg$literalExpectation("group-month", true);
+  var peg$e109 = peg$literalExpectation("group-week", true);
+  var peg$e110 = peg$literalExpectation("group-year", true);
+  var peg$e111 = peg$literalExpectation("group-quarter", true);
+  var peg$e112 = peg$otherExpectation("operator");
+  var peg$e113 = peg$literalExpectation("!=", false);
+  var peg$e114 = peg$literalExpectation(">=", false);
+  var peg$e115 = peg$literalExpectation(">", false);
+  var peg$e116 = peg$literalExpectation("<=", false);
+  var peg$e117 = peg$literalExpectation("<", false);
+  var peg$e118 = peg$otherExpectation("word");
+  var peg$e119 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e120 = peg$otherExpectation("whitespace");
+  var peg$e121 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
+  var peg$e122 = peg$otherExpectation("quote");
+  var peg$e123 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e124 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
+  var peg$e125 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
+  var peg$e126 = peg$literalExpectation("\u201C", false);
+  var peg$e127 = peg$literalExpectation("\u201D", false);
+  var peg$e128 = peg$literalExpectation("\"", false);
+  var peg$e129 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e130 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e131 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
+  var peg$e132 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
+  var peg$e133 = peg$classExpectation([","], false, false);
+  var peg$e134 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false);
 
   var peg$f0 = function(filters) { return applyDefaults(filters); };
   var peg$f1 = function(head, tail) {
@@ -565,77 +577,80 @@ function peg$parse(input, options) {
   var peg$f47 = function() { return "limit"; };
   var peg$f48 = function() { return "feed"; };
   var peg$f49 = function() { return "title"; };
-  var peg$f50 = function() { return "assignee"; };
-  var peg$f51 = function() { return "createdBy"; };
-  var peg$f52 = function() { return "action"; };
-  var peg$f53 = function() {return "total"; };
-  var peg$f54 = function() {return "has"; };
-  var peg$f55 = function() {return "is"; };
-  var peg$f56 = function() {return "purchaseAmount"};
-  var peg$f57 = function() {return "purchaseCurrency"};
-  var peg$f58 = function() {
+  var peg$f50 = function() { return "submitterUserID"; };
+  var peg$f51 = function() { return "submitterPayrollID"; };
+  var peg$f52 = function() { return "orderDealNumbers"; };
+  var peg$f53 = function() { return "assignee"; };
+  var peg$f54 = function() { return "createdBy"; };
+  var peg$f55 = function() { return "action"; };
+  var peg$f56 = function() {return "total"; };
+  var peg$f57 = function() {return "has"; };
+  var peg$f58 = function() {return "is"; };
+  var peg$f59 = function() {return "purchaseAmount"};
+  var peg$f60 = function() {return "purchaseCurrency"};
+  var peg$f61 = function() {
   isColumnsContext = true;
   return "columns";
 };
-  var peg$f59 = function() {return "view"};
-  var peg$f60 = function() { return isColumnsContext; };
-  var peg$f61 = function() { return "perDiem"; };
-  var peg$f62 = function() { return "drafts"; };
-  var peg$f63 = function() { return "originalamount"; };
-  var peg$f64 = function() { return "taxAmount"; };
-  var peg$f65 = function() { return "taxrate"; };
-  var peg$f66 = function() { return "policyname"; };
-  var peg$f67 = function() { return "withdrawalID"; };
-  var peg$f68 = function() { return "bankAccount"; };
-  var peg$f69 = function() { return "reportID"; };
-  var peg$f70 = function() { return "base62ReportID"; };
-  var peg$f71 = function() { return "exportedto"; };
-  var peg$f72 = function() { return "exportedTo"; };
-  var peg$f73 = function() { return "exportedTo"; };
-  var peg$f74 = function() { return "exchangeRate"; };
-  var peg$f75 = function() { return "reimbursableTotal"; };
-  var peg$f76 = function() { return "nonReimbursableTotal"; };
-  var peg$f77 = function() { return "groupFrom"; };
-  var peg$f78 = function() { return "groupExpenses"; };
-  var peg$f79 = function() { return "groupTotal"; };
-  var peg$f80 = function() { return "groupCard"; };
-  var peg$f81 = function() { return "groupFeed"; };
-  var peg$f82 = function() { return "groupBankAccount"; };
-  var peg$f83 = function() { return "groupWithdrawn"; };
-  var peg$f84 = function() { return "groupWithdrawalID"; };
-  var peg$f85 = function() { return "groupCategory"; };
-  var peg$f86 = function() { return "groupTag"; };
-  var peg$f87 = function() { return "groupMerchant"; };
-  var peg$f88 = function() { return "groupmonth"; };
-  var peg$f89 = function() { return "groupweek"; };
-  var peg$f90 = function() { return "groupyear"; };
-  var peg$f91 = function() { return "groupquarter"; };
-  var peg$f92 = function() { return "eq"; };
-  var peg$f93 = function() { return "neq"; };
-  var peg$f94 = function() { return "gte"; };
-  var peg$f95 = function() { return "gt"; };
-  var peg$f96 = function() { return "lte"; };
-  var peg$f97 = function() { return "lt"; };
-  var peg$f98 = function(o) {
+  var peg$f62 = function() {return "view"};
+  var peg$f63 = function() { return isColumnsContext; };
+  var peg$f64 = function() { return "perDiem"; };
+  var peg$f65 = function() { return "drafts"; };
+  var peg$f66 = function() { return "originalamount"; };
+  var peg$f67 = function() { return "taxAmount"; };
+  var peg$f68 = function() { return "taxrate"; };
+  var peg$f69 = function() { return "policyname"; };
+  var peg$f70 = function() { return "withdrawalID"; };
+  var peg$f71 = function() { return "bankAccount"; };
+  var peg$f72 = function() { return "reportID"; };
+  var peg$f73 = function() { return "base62ReportID"; };
+  var peg$f74 = function() { return "exportedto"; };
+  var peg$f75 = function() { return "exportedTo"; };
+  var peg$f76 = function() { return "exportedTo"; };
+  var peg$f77 = function() { return "exchangeRate"; };
+  var peg$f78 = function() { return "reimbursableTotal"; };
+  var peg$f79 = function() { return "nonReimbursableTotal"; };
+  var peg$f80 = function() { return "groupFrom"; };
+  var peg$f81 = function() { return "groupExpenses"; };
+  var peg$f82 = function() { return "groupTotal"; };
+  var peg$f83 = function() { return "groupCard"; };
+  var peg$f84 = function() { return "groupFeed"; };
+  var peg$f85 = function() { return "groupBankAccount"; };
+  var peg$f86 = function() { return "groupWithdrawn"; };
+  var peg$f87 = function() { return "groupWithdrawalID"; };
+  var peg$f88 = function() { return "groupCategory"; };
+  var peg$f89 = function() { return "groupTag"; };
+  var peg$f90 = function() { return "groupMerchant"; };
+  var peg$f91 = function() { return "groupmonth"; };
+  var peg$f92 = function() { return "groupweek"; };
+  var peg$f93 = function() { return "groupyear"; };
+  var peg$f94 = function() { return "groupquarter"; };
+  var peg$f95 = function() { return "eq"; };
+  var peg$f96 = function() { return "neq"; };
+  var peg$f97 = function() { return "gte"; };
+  var peg$f98 = function() { return "gt"; };
+  var peg$f99 = function() { return "lte"; };
+  var peg$f100 = function() { return "lt"; };
+  var peg$f101 = function(o) {
       if (nameOperator) {
         expectingNestedQuote = (o === "eq"); // Use simple parser if no valid operator is found
       }
       isColumnsContext = false;
       return o;
   };
-  var peg$f99 = function(chars) { return chars.join("").trim(); };
-  var peg$f100 = function() { 
+  var peg$f102 = function(chars) { return chars.join("").trim(); };
+  var peg$f103 = function() { 
   isColumnsContext = false;
   return "and";
 };
-  var peg$f101 = function() { return expectingNestedQuote; };
-  var peg$f102 = function(start, inner, end) { //handle no-breaking space
+  var peg$f104 = function() { return expectingNestedQuote; };
+  var peg$f105 = function(start, inner, end) { //handle no-breaking space
       return [...start, '"', ...inner, '"', ...end].join("");
     };
-  var peg$f103 = function(start) {return "“"};
-  var peg$f104 = function(start) {return "”"};
-  var peg$f105 = function(start) {return "\""};
-  var peg$f106 = function(start, inner, end) {
+  var peg$f106 = function(start) {return "“"};
+  var peg$f107 = function(start) {return "”"};
+  var peg$f108 = function(start) {return "\""};
+  var peg$f109 = function(start, inner, end) {
     return [...start, '"', ...inner, '"'].join("");
 };
   var peg$currPos = options.peg$currPos | 0;
@@ -1187,29 +1202,38 @@ function peg$parse(input, options) {
                                                                       if (s1 === peg$FAILED) {
                                                                         s1 = peg$parsetitle();
                                                                         if (s1 === peg$FAILED) {
-                                                                          s1 = peg$parseassignee();
+                                                                          s1 = peg$parsesubmitterUserID();
                                                                           if (s1 === peg$FAILED) {
-                                                                            s1 = peg$parsecreatedBy();
+                                                                            s1 = peg$parsesubmitterPayrollID();
                                                                             if (s1 === peg$FAILED) {
-                                                                              s1 = peg$parsereimbursable();
+                                                                              s1 = peg$parseorderDealNumbers();
                                                                               if (s1 === peg$FAILED) {
-                                                                                s1 = peg$parsebillable();
+                                                                                s1 = peg$parseassignee();
                                                                                 if (s1 === peg$FAILED) {
-                                                                                  s1 = peg$parseaction();
+                                                                                  s1 = peg$parsecreatedBy();
                                                                                   if (s1 === peg$FAILED) {
-                                                                                    s1 = peg$parsehas();
+                                                                                    s1 = peg$parsereimbursable();
                                                                                     if (s1 === peg$FAILED) {
-                                                                                      s1 = peg$parseis();
+                                                                                      s1 = peg$parsebillable();
                                                                                       if (s1 === peg$FAILED) {
-                                                                                        s1 = peg$parsepurchaseCurrency();
+                                                                                        s1 = peg$parseaction();
                                                                                         if (s1 === peg$FAILED) {
-                                                                                          s1 = peg$parsepurchaseAmount();
+                                                                                          s1 = peg$parsehas();
                                                                                           if (s1 === peg$FAILED) {
-                                                                                            s1 = peg$parsepolicyID();
+                                                                                            s1 = peg$parseis();
                                                                                             if (s1 === peg$FAILED) {
-                                                                                              s1 = peg$parsestatus();
+                                                                                              s1 = peg$parsepurchaseCurrency();
                                                                                               if (s1 === peg$FAILED) {
-                                                                                                s1 = peg$parsereportFieldDynamic();
+                                                                                                s1 = peg$parsepurchaseAmount();
+                                                                                                if (s1 === peg$FAILED) {
+                                                                                                  s1 = peg$parsepolicyID();
+                                                                                                  if (s1 === peg$FAILED) {
+                                                                                                    s1 = peg$parsestatus();
+                                                                                                    if (s1 === peg$FAILED) {
+                                                                                                      s1 = peg$parsereportFieldDynamic();
+                                                                                                    }
+                                                                                                  }
+                                                                                                }
                                                                                               }
                                                                                             }
                                                                                           }
@@ -2422,20 +2446,107 @@ function peg$parse(input, options) {
     return s0;
   }
 
+  function peg$parsesubmitterUserID() {
+    var s0, s1;
+
+    s0 = input.substr(peg$currPos, 15);
+    if (s0.toLowerCase() === peg$c61) {
+      peg$currPos += 15;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e66); }
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 17);
+      if (s1.toLowerCase() === peg$c62) {
+        peg$currPos += 17;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e67); }
+      }
+      if (s1 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s1 = peg$f50();
+      }
+      s0 = s1;
+    }
+
+    return s0;
+  }
+
+  function peg$parsesubmitterPayrollID() {
+    var s0, s1;
+
+    s0 = input.substr(peg$currPos, 18);
+    if (s0.toLowerCase() === peg$c63) {
+      peg$currPos += 18;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e68); }
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 20);
+      if (s1.toLowerCase() === peg$c64) {
+        peg$currPos += 20;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e69); }
+      }
+      if (s1 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s1 = peg$f51();
+      }
+      s0 = s1;
+    }
+
+    return s0;
+  }
+
+  function peg$parseorderDealNumbers() {
+    var s0, s1;
+
+    s0 = input.substr(peg$currPos, 16);
+    if (s0.toLowerCase() === peg$c65) {
+      peg$currPos += 16;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e70); }
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = input.substr(peg$currPos, 18);
+      if (s1.toLowerCase() === peg$c66) {
+        peg$currPos += 18;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e71); }
+      }
+      if (s1 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s1 = peg$f52();
+      }
+      s0 = s1;
+    }
+
+    return s0;
+  }
+
   function peg$parseassignee() {
     var s0, s1;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c61) {
+    if (s1.toLowerCase() === peg$c67) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e66); }
+      if (peg$silentFails === 0) { peg$fail(peg$e72); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f50();
+      s1 = peg$f53();
     }
     s0 = s1;
 
@@ -2446,24 +2557,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 9);
-    if (s0.toLowerCase() === peg$c62) {
+    if (s0.toLowerCase() === peg$c68) {
       peg$currPos += 9;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e67); }
+      if (peg$silentFails === 0) { peg$fail(peg$e73); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 10);
-      if (s1.toLowerCase() === peg$c63) {
+      if (s1.toLowerCase() === peg$c69) {
         peg$currPos += 10;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e68); }
+        if (peg$silentFails === 0) { peg$fail(peg$e74); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f51();
+        s1 = peg$f54();
       }
       s0 = s1;
     }
@@ -2476,15 +2587,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c64) {
+    if (s1.toLowerCase() === peg$c70) {
       peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e69); }
+      if (peg$silentFails === 0) { peg$fail(peg$e75); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f52();
+      s1 = peg$f55();
     }
     s0 = s1;
 
@@ -2496,15 +2607,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c65) {
+    if (s1.toLowerCase() === peg$c71) {
       peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e70); }
+      if (peg$silentFails === 0) { peg$fail(peg$e76); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f53();
+      s1 = peg$f56();
     }
     s0 = s1;
 
@@ -2516,15 +2627,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c66) {
+    if (s1.toLowerCase() === peg$c72) {
       peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e71); }
+      if (peg$silentFails === 0) { peg$fail(peg$e77); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f54();
+      s1 = peg$f57();
     }
     s0 = s1;
 
@@ -2536,15 +2647,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
-    if (s1.toLowerCase() === peg$c67) {
+    if (s1.toLowerCase() === peg$c73) {
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e72); }
+      if (peg$silentFails === 0) { peg$fail(peg$e78); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f55();
+      s1 = peg$f58();
     }
     s0 = s1;
 
@@ -2555,24 +2666,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 14);
-    if (s0.toLowerCase() === peg$c68) {
+    if (s0.toLowerCase() === peg$c74) {
       peg$currPos += 14;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e73); }
+      if (peg$silentFails === 0) { peg$fail(peg$e79); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 15);
-      if (s1.toLowerCase() === peg$c69) {
+      if (s1.toLowerCase() === peg$c75) {
         peg$currPos += 15;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e74); }
+        if (peg$silentFails === 0) { peg$fail(peg$e80); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f56();
+        s1 = peg$f59();
       }
       s0 = s1;
     }
@@ -2584,24 +2695,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 16);
-    if (s0.toLowerCase() === peg$c70) {
+    if (s0.toLowerCase() === peg$c76) {
       peg$currPos += 16;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e75); }
+      if (peg$silentFails === 0) { peg$fail(peg$e81); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 17);
-      if (s1.toLowerCase() === peg$c71) {
+      if (s1.toLowerCase() === peg$c77) {
         peg$currPos += 17;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e76); }
+        if (peg$silentFails === 0) { peg$fail(peg$e82); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f57();
+        s1 = peg$f60();
       }
       s0 = s1;
     }
@@ -2614,15 +2725,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 7);
-    if (s1.toLowerCase() === peg$c72) {
+    if (s1.toLowerCase() === peg$c78) {
       peg$currPos += 7;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e77); }
+      if (peg$silentFails === 0) { peg$fail(peg$e83); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f58();
+      s1 = peg$f61();
     }
     s0 = s1;
 
@@ -2634,15 +2745,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c73) {
+    if (s1.toLowerCase() === peg$c79) {
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e78); }
+      if (peg$silentFails === 0) { peg$fail(peg$e84); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f59();
+      s1 = peg$f62();
     }
     s0 = s1;
 
@@ -2654,7 +2765,7 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
-    s1 = peg$f60();
+    s1 = peg$f63();
     if (s1) {
       s1 = undefined;
     } else {
@@ -2774,11 +2885,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c74) {
+    if (s1.toLowerCase() === peg$c80) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e79); }
+      if (peg$silentFails === 0) { peg$fail(peg$e85); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -2793,7 +2904,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f61();
+        s0 = peg$f64();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2811,19 +2922,19 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c75) {
+    if (s1.toLowerCase() === peg$c81) {
       peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e80); }
+      if (peg$silentFails === 0) { peg$fail(peg$e86); }
     }
     if (s1 === peg$FAILED) {
       s1 = input.substr(peg$currPos, 5);
-      if (s1.toLowerCase() === peg$c76) {
+      if (s1.toLowerCase() === peg$c82) {
         peg$currPos += 5;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e81); }
+        if (peg$silentFails === 0) { peg$fail(peg$e87); }
       }
     }
     if (s1 !== peg$FAILED) {
@@ -2839,7 +2950,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f62();
+        s0 = peg$f65();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2857,11 +2968,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 15);
-    if (s1.toLowerCase() === peg$c69) {
+    if (s1.toLowerCase() === peg$c75) {
       peg$currPos += 15;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e74); }
+      if (peg$silentFails === 0) { peg$fail(peg$e80); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -2876,7 +2987,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f63();
+        s0 = peg$f66();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2894,11 +3005,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c77) {
+    if (s1.toLowerCase() === peg$c83) {
       peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e82); }
+      if (peg$silentFails === 0) { peg$fail(peg$e88); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -2913,7 +3024,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f64();
+        s0 = peg$f67();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2950,7 +3061,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f65();
+        s0 = peg$f68();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2968,11 +3079,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c78) {
+    if (s1.toLowerCase() === peg$c84) {
       peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e83); }
+      if (peg$silentFails === 0) { peg$fail(peg$e89); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -2987,7 +3098,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f66();
+        s0 = peg$f69();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3024,7 +3135,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f67();
+        s0 = peg$f70();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3061,7 +3172,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f68();
+        s0 = peg$f71();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3079,11 +3190,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c79) {
+    if (s1.toLowerCase() === peg$c85) {
       peg$currPos += 14;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e84); }
+      if (peg$silentFails === 0) { peg$fail(peg$e90); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3098,7 +3209,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f69();
+        s0 = peg$f72();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3135,7 +3246,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f70();
+        s0 = peg$f73();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3153,11 +3264,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c80) {
+    if (s1.toLowerCase() === peg$c86) {
       peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e85); }
+      if (peg$silentFails === 0) { peg$fail(peg$e91); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3172,7 +3283,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f71();
+        s0 = peg$f74();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3197,7 +3308,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e86); }
+        if (peg$silentFails === 0) { peg$fail(peg$e92); }
       }
       if (s2 !== peg$FAILED) {
         s1 = [s1, s2];
@@ -3216,11 +3327,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c81) {
+    if (s1.toLowerCase() === peg$c87) {
       peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e87); }
+      if (peg$silentFails === 0) { peg$fail(peg$e93); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3235,7 +3346,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f72();
+        s0 = peg$f75();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3247,11 +3358,11 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 11);
-      if (s1.toLowerCase() === peg$c80) {
+      if (s1.toLowerCase() === peg$c86) {
         peg$currPos += 11;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e85); }
+        if (peg$silentFails === 0) { peg$fail(peg$e91); }
       }
       if (s1 !== peg$FAILED) {
         s2 = peg$currPos;
@@ -3266,7 +3377,7 @@ function peg$parse(input, options) {
         }
         if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f73();
+          s0 = peg$f76();
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -3285,11 +3396,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 13);
-    if (s1.toLowerCase() === peg$c82) {
+    if (s1.toLowerCase() === peg$c88) {
       peg$currPos += 13;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e88); }
+      if (peg$silentFails === 0) { peg$fail(peg$e94); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3304,7 +3415,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f74();
+        s0 = peg$f77();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3322,11 +3433,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 18);
-    if (s1.toLowerCase() === peg$c83) {
+    if (s1.toLowerCase() === peg$c89) {
       peg$currPos += 18;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e89); }
+      if (peg$silentFails === 0) { peg$fail(peg$e95); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3341,7 +3452,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f75();
+        s0 = peg$f78();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3359,11 +3470,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 22);
-    if (s1.toLowerCase() === peg$c84) {
+    if (s1.toLowerCase() === peg$c90) {
       peg$currPos += 22;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e90); }
+      if (peg$silentFails === 0) { peg$fail(peg$e96); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3378,7 +3489,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f76();
+        s0 = peg$f79();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3396,11 +3507,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c85) {
+    if (s1.toLowerCase() === peg$c91) {
       peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e91); }
+      if (peg$silentFails === 0) { peg$fail(peg$e97); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3415,7 +3526,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f77();
+        s0 = peg$f80();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3433,11 +3544,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c86) {
+    if (s1.toLowerCase() === peg$c92) {
       peg$currPos += 14;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e92); }
+      if (peg$silentFails === 0) { peg$fail(peg$e98); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3452,7 +3563,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f78();
+        s0 = peg$f81();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3470,11 +3581,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c87) {
+    if (s1.toLowerCase() === peg$c93) {
       peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e93); }
+      if (peg$silentFails === 0) { peg$fail(peg$e99); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3489,7 +3600,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f79();
+        s0 = peg$f82();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3507,11 +3618,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c88) {
+    if (s1.toLowerCase() === peg$c94) {
       peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e94); }
+      if (peg$silentFails === 0) { peg$fail(peg$e100); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3526,7 +3637,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f80();
+        s0 = peg$f83();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3544,11 +3655,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c89) {
+    if (s1.toLowerCase() === peg$c95) {
       peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e95); }
+      if (peg$silentFails === 0) { peg$fail(peg$e101); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3563,7 +3674,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f81();
+        s0 = peg$f84();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3581,11 +3692,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 18);
-    if (s1.toLowerCase() === peg$c90) {
+    if (s1.toLowerCase() === peg$c96) {
       peg$currPos += 18;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e96); }
+      if (peg$silentFails === 0) { peg$fail(peg$e102); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3600,7 +3711,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f82();
+        s0 = peg$f85();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3618,11 +3729,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 15);
-    if (s1.toLowerCase() === peg$c91) {
+    if (s1.toLowerCase() === peg$c97) {
       peg$currPos += 15;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e97); }
+      if (peg$silentFails === 0) { peg$fail(peg$e103); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3637,7 +3748,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f83();
+        s0 = peg$f86();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3655,11 +3766,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 19);
-    if (s1.toLowerCase() === peg$c92) {
+    if (s1.toLowerCase() === peg$c98) {
       peg$currPos += 19;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e98); }
+      if (peg$silentFails === 0) { peg$fail(peg$e104); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3674,7 +3785,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f84();
+        s0 = peg$f87();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3692,11 +3803,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c93) {
+    if (s1.toLowerCase() === peg$c99) {
       peg$currPos += 14;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e99); }
+      if (peg$silentFails === 0) { peg$fail(peg$e105); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3711,7 +3822,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f85();
+        s0 = peg$f88();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3729,11 +3840,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c94) {
+    if (s1.toLowerCase() === peg$c100) {
       peg$currPos += 9;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e100); }
+      if (peg$silentFails === 0) { peg$fail(peg$e106); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3748,7 +3859,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f86();
+        s0 = peg$f89();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3766,11 +3877,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c95) {
+    if (s1.toLowerCase() === peg$c101) {
       peg$currPos += 14;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e101); }
+      if (peg$silentFails === 0) { peg$fail(peg$e107); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3785,7 +3896,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f87();
+        s0 = peg$f90();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3803,11 +3914,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c96) {
+    if (s1.toLowerCase() === peg$c102) {
       peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e102); }
+      if (peg$silentFails === 0) { peg$fail(peg$e108); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3822,7 +3933,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f88();
+        s0 = peg$f91();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3840,11 +3951,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c97) {
+    if (s1.toLowerCase() === peg$c103) {
       peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e103); }
+      if (peg$silentFails === 0) { peg$fail(peg$e109); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3859,7 +3970,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f89();
+        s0 = peg$f92();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3877,11 +3988,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c98) {
+    if (s1.toLowerCase() === peg$c104) {
       peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e104); }
+      if (peg$silentFails === 0) { peg$fail(peg$e110); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3896,7 +4007,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f90();
+        s0 = peg$f93();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3914,11 +4025,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 13);
-    if (s1.toLowerCase() === peg$c99) {
+    if (s1.toLowerCase() === peg$c105) {
       peg$currPos += 13;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e105); }
+      if (peg$silentFails === 0) { peg$fail(peg$e111); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3933,7 +4044,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f91();
+        s0 = peg$f94();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3956,81 +4067,81 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e86); }
+      if (peg$silentFails === 0) { peg$fail(peg$e92); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f92();
+      s1 = peg$f95();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c100) {
-        s1 = peg$c100;
+      if (input.substr(peg$currPos, 2) === peg$c106) {
+        s1 = peg$c106;
         peg$currPos += 2;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e107); }
+        if (peg$silentFails === 0) { peg$fail(peg$e113); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f93();
+        s1 = peg$f96();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 2) === peg$c101) {
-          s1 = peg$c101;
+        if (input.substr(peg$currPos, 2) === peg$c107) {
+          s1 = peg$c107;
           peg$currPos += 2;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e108); }
+          if (peg$silentFails === 0) { peg$fail(peg$e114); }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f94();
+          s1 = peg$f97();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
           if (input.charCodeAt(peg$currPos) === 62) {
-            s1 = peg$c102;
+            s1 = peg$c108;
             peg$currPos++;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e109); }
+            if (peg$silentFails === 0) { peg$fail(peg$e115); }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$f95();
+            s1 = peg$f98();
           }
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 2) === peg$c103) {
-              s1 = peg$c103;
+            if (input.substr(peg$currPos, 2) === peg$c109) {
+              s1 = peg$c109;
               peg$currPos += 2;
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e110); }
+              if (peg$silentFails === 0) { peg$fail(peg$e116); }
             }
             if (s1 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$f96();
+              s1 = peg$f99();
             }
             s0 = s1;
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
               if (input.charCodeAt(peg$currPos) === 60) {
-                s1 = peg$c104;
+                s1 = peg$c110;
                 peg$currPos++;
               } else {
                 s1 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e111); }
+                if (peg$silentFails === 0) { peg$fail(peg$e117); }
               }
               if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$f97();
+                s1 = peg$f100();
               }
               s0 = s1;
             }
@@ -4041,7 +4152,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e106); }
+      if (peg$silentFails === 0) { peg$fail(peg$e112); }
     }
 
     return s0;
@@ -4054,7 +4165,7 @@ function peg$parse(input, options) {
     s1 = peg$parseoperator();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f98(s1);
+      s1 = peg$f101(s1);
     }
     s0 = s1;
 
@@ -4072,7 +4183,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e113); }
+      if (peg$silentFails === 0) { peg$fail(peg$e119); }
     }
     if (s2 !== peg$FAILED) {
       while (s2 !== peg$FAILED) {
@@ -4082,7 +4193,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e113); }
+          if (peg$silentFails === 0) { peg$fail(peg$e119); }
         }
       }
     } else {
@@ -4090,13 +4201,13 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f99(s1);
+      s1 = peg$f102(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e112); }
+      if (peg$silentFails === 0) { peg$fail(peg$e118); }
     }
 
     return s0;
@@ -4108,7 +4219,7 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$parse_();
     peg$savedPos = s0;
-    s1 = peg$f100();
+    s1 = peg$f103();
     s0 = s1;
 
     return s0;
@@ -4124,7 +4235,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e115); }
+      if (peg$silentFails === 0) { peg$fail(peg$e121); }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
@@ -4133,12 +4244,12 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e115); }
+        if (peg$silentFails === 0) { peg$fail(peg$e121); }
       }
     }
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e114); }
+    if (peg$silentFails === 0) { peg$fail(peg$e120); }
 
     return s0;
   }
@@ -4148,7 +4259,7 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
-    s1 = peg$f101();
+    s1 = peg$f104();
     if (s1) {
       s1 = undefined;
     } else {
@@ -4185,7 +4296,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e117); }
+      if (peg$silentFails === 0) { peg$fail(peg$e123); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -4194,7 +4305,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e117); }
+        if (peg$silentFails === 0) { peg$fail(peg$e123); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -4202,7 +4313,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e118); }
+      if (peg$silentFails === 0) { peg$fail(peg$e124); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -4211,7 +4322,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e119); }
+        if (peg$silentFails === 0) { peg$fail(peg$e125); }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
@@ -4220,7 +4331,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e119); }
+          if (peg$silentFails === 0) { peg$fail(peg$e125); }
         }
       }
       s4 = input.charAt(peg$currPos);
@@ -4228,7 +4339,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e118); }
+        if (peg$silentFails === 0) { peg$fail(peg$e124); }
       }
       if (s4 !== peg$FAILED) {
         s5 = [];
@@ -4237,7 +4348,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e113); }
+          if (peg$silentFails === 0) { peg$fail(peg$e119); }
         }
         while (s6 !== peg$FAILED) {
           s5.push(s6);
@@ -4246,11 +4357,11 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e113); }
+            if (peg$silentFails === 0) { peg$fail(peg$e119); }
           }
         }
         peg$savedPos = s0;
-        s0 = peg$f102(s1, s3, s5);
+        s0 = peg$f105(s1, s3, s5);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4262,7 +4373,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e116); }
+      if (peg$silentFails === 0) { peg$fail(peg$e122); }
     }
 
     return s0;
@@ -4279,7 +4390,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e117); }
+      if (peg$silentFails === 0) { peg$fail(peg$e123); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -4288,7 +4399,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e117); }
+        if (peg$silentFails === 0) { peg$fail(peg$e123); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -4296,7 +4407,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e118); }
+      if (peg$silentFails === 0) { peg$fail(peg$e124); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -4305,7 +4416,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e119); }
+        if (peg$silentFails === 0) { peg$fail(peg$e125); }
       }
       if (s4 === peg$FAILED) {
         s4 = peg$currPos;
@@ -4321,15 +4432,15 @@ function peg$parse(input, options) {
         }
         if (s5 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 8220) {
-            s6 = peg$c105;
+            s6 = peg$c111;
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e120); }
+            if (peg$silentFails === 0) { peg$fail(peg$e126); }
           }
           if (s6 !== peg$FAILED) {
             peg$savedPos = s4;
-            s4 = peg$f103(s1);
+            s4 = peg$f106(s1);
           } else {
             peg$currPos = s4;
             s4 = peg$FAILED;
@@ -4352,15 +4463,15 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8221) {
-              s6 = peg$c106;
+              s6 = peg$c112;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e121); }
+              if (peg$silentFails === 0) { peg$fail(peg$e127); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f104(s1);
+              s4 = peg$f107(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -4383,15 +4494,15 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 34) {
-                s6 = peg$c107;
+                s6 = peg$c113;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e122); }
+                if (peg$silentFails === 0) { peg$fail(peg$e128); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f105(s1);
+                s4 = peg$f108(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -4410,7 +4521,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e119); }
+          if (peg$silentFails === 0) { peg$fail(peg$e125); }
         }
         if (s4 === peg$FAILED) {
           s4 = peg$currPos;
@@ -4426,15 +4537,15 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8220) {
-              s6 = peg$c105;
+              s6 = peg$c111;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e120); }
+              if (peg$silentFails === 0) { peg$fail(peg$e126); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f103(s1);
+              s4 = peg$f106(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -4457,15 +4568,15 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 8221) {
-                s6 = peg$c106;
+                s6 = peg$c112;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e121); }
+                if (peg$silentFails === 0) { peg$fail(peg$e127); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f104(s1);
+                s4 = peg$f107(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -4488,15 +4599,15 @@ function peg$parse(input, options) {
               }
               if (s5 !== peg$FAILED) {
                 if (input.charCodeAt(peg$currPos) === 34) {
-                  s6 = peg$c107;
+                  s6 = peg$c113;
                   peg$currPos++;
                 } else {
                   s6 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e122); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e128); }
                 }
                 if (s6 !== peg$FAILED) {
                   peg$savedPos = s4;
-                  s4 = peg$f105(s1);
+                  s4 = peg$f108(s1);
                 } else {
                   peg$currPos = s4;
                   s4 = peg$FAILED;
@@ -4512,7 +4623,7 @@ function peg$parse(input, options) {
       s4 = peg$parseclosingQuote();
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f106(s1, s3, s4);
+        s0 = peg$f109(s1, s3, s4);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4524,7 +4635,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e116); }
+      if (peg$silentFails === 0) { peg$fail(peg$e122); }
     }
 
     return s0;
@@ -4539,7 +4650,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e118); }
+      if (peg$silentFails === 0) { peg$fail(peg$e124); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4577,7 +4688,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e123); }
+      if (peg$silentFails === 0) { peg$fail(peg$e129); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -4586,7 +4697,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e123); }
+        if (peg$silentFails === 0) { peg$fail(peg$e129); }
       }
     }
     s2 = [];
@@ -4595,7 +4706,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s3 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e124); }
+      if (peg$silentFails === 0) { peg$fail(peg$e130); }
     }
     while (s3 !== peg$FAILED) {
       s2.push(s3);
@@ -4604,7 +4715,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e124); }
+        if (peg$silentFails === 0) { peg$fail(peg$e130); }
       }
     }
     s3 = [];
@@ -4613,7 +4724,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s4 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e125); }
+      if (peg$silentFails === 0) { peg$fail(peg$e131); }
     }
     while (s4 !== peg$FAILED) {
       s3.push(s4);
@@ -4622,7 +4733,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e125); }
+        if (peg$silentFails === 0) { peg$fail(peg$e131); }
       }
     }
     s4 = peg$parseoperator();
@@ -4641,7 +4752,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e126); }
+        if (peg$silentFails === 0) { peg$fail(peg$e132); }
       }
       while (s2 !== peg$FAILED) {
         s1.push(s2);
@@ -4650,7 +4761,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e126); }
+          if (peg$silentFails === 0) { peg$fail(peg$e132); }
         }
       }
       s2 = peg$currPos;
@@ -4697,7 +4808,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e127); }
+          if (peg$silentFails === 0) { peg$fail(peg$e133); }
         }
       }
     }
@@ -4713,7 +4824,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e128); }
+      if (peg$silentFails === 0) { peg$fail(peg$e134); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
diff --git a/src/libs/SearchParser/searchParser.peggy b/src/libs/SearchParser/searchParser.peggy
index 57389645633f..7a48b0da4e3a 100644
--- a/src/libs/SearchParser/searchParser.peggy
+++ b/src/libs/SearchParser/searchParser.peggy
@@ -290,6 +290,9 @@ key "key"
       / withdrawn
       / feed
       / title
+      / submitterUserID
+      / submitterPayrollID
+      / orderDealNumbers
       / assignee
       / createdBy
       / reimbursable
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index af032b9160d0..ff3a405c00c4 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -918,6 +918,9 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
                     filterKey === FILTER_KEYS.REIMBURSABLE ||
                     filterKey === FILTER_KEYS.BILLABLE ||
                     filterKey === FILTER_KEYS.TITLE ||
+                    filterKey === FILTER_KEYS.SUBMITTER_USER_ID ||
+                    filterKey === FILTER_KEYS.SUBMITTER_PAYROLL_ID ||
+                    filterKey === FILTER_KEYS.ORDER_DEAL_NUMBERS ||
                     filterKey === FILTER_KEYS.PAYER ||
                     filterKey === FILTER_KEYS.GROUP_CURRENCY ||
                     filterKey === FILTER_KEYS.WITHDRAWAL_TYPE ||
@@ -1319,6 +1322,13 @@ function buildFilterFormValuesFromQuery(
         if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT || filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.DESCRIPTION || filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.TITLE) {
             filtersForm[addNegation(filterKey, isNegated)] = filterValues.join(',');
         }
+        if (
+            filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.SUBMITTER_USER_ID ||
+            filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.SUBMITTER_PAYROLL_ID ||
+            filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.ORDER_DEAL_NUMBERS
+        ) {
+            filtersForm[addNegation(filterKey, isNegated)] = filterValues.join(',');
+        }
         if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.ACTION) {
             const actionValue = filterValues.join(',');
             filtersForm[addNegation(filterKey, isNegated)] =
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 0b2b2514b1c3..9c5d8ff0b497 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -5340,6 +5340,18 @@ const FILTER_VIEW_MAP = {
         labelKey: 'common.title',
         icon: 'Bookmark',
     },
+    [CONST.SEARCH.SYNTAX_FILTER_KEYS.SUBMITTER_USER_ID]: {
+        labelKey: 'workspace.common.customField1',
+        icon: 'Pencil',
+    },
+    [CONST.SEARCH.SYNTAX_FILTER_KEYS.SUBMITTER_PAYROLL_ID]: {
+        labelKey: 'workspace.common.customField2',
+        icon: 'Pencil',
+    },
+    [CONST.SEARCH.SYNTAX_FILTER_KEYS.ORDER_DEAL_NUMBERS]: {
+        labelKey: 'common.internationalReimbursementIDs',
+        icon: 'Hashtag',
+    },
     [CONST.SEARCH.SYNTAX_FILTER_KEYS.WITHDRAWAL_ID]: {
         labelKey: 'common.withdrawalID',
         icon: 'Fingerprint',
diff --git a/src/types/form/SearchAdvancedFiltersForm.ts b/src/types/form/SearchAdvancedFiltersForm.ts
index 78ebe17f94bf..6d8c2a5556c5 100644
--- a/src/types/form/SearchAdvancedFiltersForm.ts
+++ b/src/types/form/SearchAdvancedFiltersForm.ts
@@ -28,6 +28,9 @@ const TEXT_FILTER_KEYS = new Set<SearchTextFilterKeys>([
     CONST.SEARCH.SYNTAX_FILTER_KEYS.KEYWORD,
     CONST.SEARCH.SYNTAX_FILTER_KEYS.TITLE,
     CONST.SEARCH.SYNTAX_FILTER_KEYS.WITHDRAWAL_ID,
+    CONST.SEARCH.SYNTAX_FILTER_KEYS.SUBMITTER_USER_ID,
+    CONST.SEARCH.SYNTAX_FILTER_KEYS.SUBMITTER_PAYROLL_ID,
+    CONST.SEARCH.SYNTAX_FILTER_KEYS.ORDER_DEAL_NUMBERS,
     CONST.SEARCH.SYNTAX_ROOT_KEYS.LIMIT,
 ]);
 
@@ -192,6 +195,15 @@ const FILTER_KEYS = {
     TITLE_NOT: 'titleNot',
     TITLE: 'title',
 
+    SUBMITTER_USER_ID_NOT: 'submitterUserIDNot',
+    SUBMITTER_USER_ID: 'submitterUserID',
+
+    SUBMITTER_PAYROLL_ID_NOT: 'submitterPayrollIDNot',
+    SUBMITTER_PAYROLL_ID: 'submitterPayrollID',
+
+    ORDER_DEAL_NUMBERS_NOT: 'orderDealNumbersNot',
+    ORDER_DEAL_NUMBERS: 'orderDealNumbers',
+
     ASSIGNEE_NOT: 'assigneeNot',
     ASSIGNEE: 'assignee',
 
@@ -340,6 +352,12 @@ const ALLOWED_TYPE_FILTERS: Record<string, Set<string>> = {
         FILTER_KEYS.WITHDRAWAL_ID_NOT,
         FILTER_KEYS.TITLE,
         FILTER_KEYS.TITLE_NOT,
+        FILTER_KEYS.SUBMITTER_USER_ID,
+        FILTER_KEYS.SUBMITTER_USER_ID_NOT,
+        FILTER_KEYS.SUBMITTER_PAYROLL_ID,
+        FILTER_KEYS.SUBMITTER_PAYROLL_ID_NOT,
+        FILTER_KEYS.ORDER_DEAL_NUMBERS,
+        FILTER_KEYS.ORDER_DEAL_NUMBERS_NOT,
         FILTER_KEYS.ATTENDEE,
         FILTER_KEYS.REPORT_FIELD,
         FILTER_KEYS.ATTENDEE_NOT,
@@ -413,6 +431,12 @@ const ALLOWED_TYPE_FILTERS: Record<string, Set<string>> = {
         FILTER_KEYS.WITHDRAWAL_ID_NOT,
         FILTER_KEYS.TITLE,
         FILTER_KEYS.TITLE_NOT,
+        FILTER_KEYS.SUBMITTER_USER_ID,
+        FILTER_KEYS.SUBMITTER_USER_ID_NOT,
+        FILTER_KEYS.SUBMITTER_PAYROLL_ID,
+        FILTER_KEYS.SUBMITTER_PAYROLL_ID_NOT,
+        FILTER_KEYS.ORDER_DEAL_NUMBERS,
+        FILTER_KEYS.ORDER_DEAL_NUMBERS_NOT,
         FILTER_KEYS.REPORT_FIELD,
         FILTER_KEYS.COLUMNS,
     ]),
@@ -792,6 +816,15 @@ type SearchAdvancedFiltersForm = Form<
         [FILTER_KEYS.TITLE]: string;
         [FILTER_KEYS.TITLE_NOT]: string;
 
+        [FILTER_KEYS.SUBMITTER_USER_ID]: string;
+        [FILTER_KEYS.SUBMITTER_USER_ID_NOT]: string;
+
+        [FILTER_KEYS.SUBMITTER_PAYROLL_ID]: string;
+        [FILTER_KEYS.SUBMITTER_PAYROLL_ID_NOT]: string;
+
+        [FILTER_KEYS.ORDER_DEAL_NUMBERS]: string;
+        [FILTER_KEYS.ORDER_DEAL_NUMBERS_NOT]: string;
+
         [FILTER_KEYS.ASSIGNEE]: string[];
         [FILTER_KEYS.ASSIGNEE_NOT]: string[];