From 3be7786db6f67d9742342e61e99f14f935b29a1e Mon Sep 17 00:00:00 2001
From: ShridharGoel <35566748+ShridharGoel@users.noreply.github.com>
Date: Wed, 28 Jan 2026 18:05:20 +0530
Subject: [PATCH] Update parser files for group-by:tag

---
 src/libs/SearchParser/autocompleteParser.js | 305 ++++++++++---------
 src/libs/SearchParser/baseRules.peggy       |   2 +
 src/libs/SearchParser/searchParser.js       | 307 +++++++++++---------
 src/libs/SearchParser/searchParser.peggy    |   2 +
 4 files changed, 354 insertions(+), 262 deletions(-)

diff --git a/src/libs/SearchParser/autocompleteParser.js b/src/libs/SearchParser/autocompleteParser.js
index 95b3aea65ccd..c03f2f48d483 100644
--- a/src/libs/SearchParser/autocompleteParser.js
+++ b/src/libs/SearchParser/autocompleteParser.js
@@ -270,15 +270,16 @@ function peg$parse(input, options) {
   var peg$c84 = "group-withdrawn";
   var peg$c85 = "group-withdrawal-id";
   var peg$c86 = "group-category";
-  var peg$c87 = "group-month";
-  var peg$c88 = "!=";
-  var peg$c89 = ">=";
-  var peg$c90 = ">";
-  var peg$c91 = "<=";
-  var peg$c92 = "<";
-  var peg$c93 = "\u201C";
-  var peg$c94 = "\u201D";
-  var peg$c95 = "\"";
+  var peg$c87 = "group-tag";
+  var peg$c88 = "group-month";
+  var peg$c89 = "!=";
+  var peg$c90 = ">=";
+  var peg$c91 = ">";
+  var peg$c92 = "<=";
+  var peg$c93 = "<";
+  var peg$c94 = "\u201C";
+  var peg$c95 = "\u201D";
+  var peg$c96 = "\"";
 
   var peg$r0 = /^[ \t\r\n\xA0,:=<>!]/;
   var peg$r1 = /^[:=]/;
@@ -384,31 +385,32 @@ function peg$parse(input, options) {
   var peg$e87 = peg$literalExpectation("group-withdrawn", true);
   var peg$e88 = peg$literalExpectation("group-withdrawal-id", true);
   var peg$e89 = peg$literalExpectation("group-category", true);
-  var peg$e90 = peg$literalExpectation("group-month", true);
-  var peg$e91 = peg$otherExpectation("operator");
-  var peg$e92 = peg$classExpectation([":", "="], false, false);
-  var peg$e93 = peg$literalExpectation("!=", false);
-  var peg$e94 = peg$literalExpectation(">=", false);
-  var peg$e95 = peg$literalExpectation(">", false);
-  var peg$e96 = peg$literalExpectation("<=", false);
-  var peg$e97 = peg$literalExpectation("<", false);
-  var peg$e98 = peg$otherExpectation("word");
-  var peg$e99 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e100 = peg$otherExpectation("whitespace");
-  var peg$e101 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
-  var peg$e102 = peg$otherExpectation("quote");
-  var peg$e103 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e104 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
-  var peg$e105 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
-  var peg$e106 = peg$literalExpectation("\u201C", false);
-  var peg$e107 = peg$literalExpectation("\u201D", false);
-  var peg$e108 = peg$literalExpectation("\"", false);
-  var peg$e109 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e110 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e111 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
-  var peg$e112 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
-  var peg$e113 = peg$classExpectation([","], false, false);
-  var peg$e114 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false);
+  var peg$e90 = peg$literalExpectation("group-tag", true);
+  var peg$e91 = peg$literalExpectation("group-month", true);
+  var peg$e92 = peg$otherExpectation("operator");
+  var peg$e93 = peg$classExpectation([":", "="], false, false);
+  var peg$e94 = peg$literalExpectation("!=", false);
+  var peg$e95 = peg$literalExpectation(">=", false);
+  var peg$e96 = peg$literalExpectation(">", false);
+  var peg$e97 = peg$literalExpectation("<=", false);
+  var peg$e98 = peg$literalExpectation("<", false);
+  var peg$e99 = peg$otherExpectation("word");
+  var peg$e100 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e101 = peg$otherExpectation("whitespace");
+  var peg$e102 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
+  var peg$e103 = peg$otherExpectation("quote");
+  var peg$e104 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e105 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
+  var peg$e106 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
+  var peg$e107 = peg$literalExpectation("\u201C", false);
+  var peg$e108 = peg$literalExpectation("\u201D", false);
+  var peg$e109 = peg$literalExpectation("\"", false);
+  var peg$e110 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e111 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e112 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
+  var peg$e113 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
+  var peg$e114 = peg$classExpectation([","], false, false);
+  var peg$e115 = 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(); };
@@ -547,33 +549,34 @@ function peg$parse(input, options) {
   var peg$f76 = function() { return "groupWithdrawn"; };
   var peg$f77 = function() { return "groupWithdrawalID"; };
   var peg$f78 = function() { return "groupCategory"; };
-  var peg$f79 = function() { return "groupMonth"; };
-  var peg$f80 = function() { return "eq"; };
-  var peg$f81 = function() { return "neq"; };
-  var peg$f82 = function() { return "gte"; };
-  var peg$f83 = function() { return "gt"; };
-  var peg$f84 = function() { return "lte"; };
-  var peg$f85 = function() { return "lt"; };
-  var peg$f86 = function(o) {
+  var peg$f79 = function() { return "groupTag"; };
+  var peg$f80 = function() { return "groupMonth"; };
+  var peg$f81 = function() { return "eq"; };
+  var peg$f82 = function() { return "neq"; };
+  var peg$f83 = function() { return "gte"; };
+  var peg$f84 = function() { return "gt"; };
+  var peg$f85 = function() { return "lte"; };
+  var peg$f86 = function() { return "lt"; };
+  var peg$f87 = function(o) {
       if (nameOperator) {
         expectingNestedQuote = (o === "eq"); // Use simple parser if no valid operator is found
       }
       isColumnsContext = false;
       return o;
   };
-  var peg$f87 = function(chars) { return chars.join("").trim(); };
-  var peg$f88 = function() { 
+  var peg$f88 = function(chars) { return chars.join("").trim(); };
+  var peg$f89 = function() { 
   isColumnsContext = false;
   return "and";
 };
-  var peg$f89 = function() { return expectingNestedQuote; };
-  var peg$f90 = function(start, inner, end) { //handle no-breaking space
+  var peg$f90 = function() { return expectingNestedQuote; };
+  var peg$f91 = function(start, inner, end) { //handle no-breaking space
       return [...start, '"', ...inner, '"', ...end].join("");
     };
-  var peg$f91 = function(start) {return "“"};
-  var peg$f92 = function(start) {return "”"};
-  var peg$f93 = function(start) {return "\""};
-  var peg$f94 = function(start, inner, end) {
+  var peg$f92 = function(start) {return "“"};
+  var peg$f93 = function(start) {return "”"};
+  var peg$f94 = function(start) {return "\""};
+  var peg$f95 = function(start, inner, end) {
     return [...start, '"', ...inner, '"'].join("");
 };
   var peg$currPos = options.peg$currPos | 0;
@@ -2375,7 +2378,10 @@ function peg$parse(input, options) {
                                           if (s0 === peg$FAILED) {
                                             s0 = peg$parsegroupCategory();
                                             if (s0 === peg$FAILED) {
-                                              s0 = peg$parsegroupMonth();
+                                              s0 = peg$parsegroupTag();
+                                              if (s0 === peg$FAILED) {
+                                                s0 = peg$parsegroupMonth();
+                                              }
                                             }
                                           }
                                         }
@@ -3261,13 +3267,13 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsegroupMonth() {
+  function peg$parsegroupTag() {
     var s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 11);
+    s1 = input.substr(peg$currPos, 9);
     if (s1.toLowerCase() === peg$c87) {
-      peg$currPos += 11;
+      peg$currPos += 9;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e90); }
@@ -3298,6 +3304,43 @@ function peg$parse(input, options) {
     return s0;
   }
 
+  function peg$parsegroupMonth() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 11);
+    if (s1.toLowerCase() === peg$c88) {
+      peg$currPos += 11;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e91); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f80();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
   function peg$parseoperator() {
     var s0, s1;
 
@@ -3308,81 +3351,81 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e92); }
+      if (peg$silentFails === 0) { peg$fail(peg$e93); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f80();
+      s1 = peg$f81();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c88) {
-        s1 = peg$c88;
+      if (input.substr(peg$currPos, 2) === peg$c89) {
+        s1 = peg$c89;
         peg$currPos += 2;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e93); }
+        if (peg$silentFails === 0) { peg$fail(peg$e94); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f81();
+        s1 = peg$f82();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 2) === peg$c89) {
-          s1 = peg$c89;
+        if (input.substr(peg$currPos, 2) === peg$c90) {
+          s1 = peg$c90;
           peg$currPos += 2;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e94); }
+          if (peg$silentFails === 0) { peg$fail(peg$e95); }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f82();
+          s1 = peg$f83();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
           if (input.charCodeAt(peg$currPos) === 62) {
-            s1 = peg$c90;
+            s1 = peg$c91;
             peg$currPos++;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e95); }
+            if (peg$silentFails === 0) { peg$fail(peg$e96); }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$f83();
+            s1 = peg$f84();
           }
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 2) === peg$c91) {
-              s1 = peg$c91;
+            if (input.substr(peg$currPos, 2) === peg$c92) {
+              s1 = peg$c92;
               peg$currPos += 2;
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e96); }
+              if (peg$silentFails === 0) { peg$fail(peg$e97); }
             }
             if (s1 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$f84();
+              s1 = peg$f85();
             }
             s0 = s1;
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
               if (input.charCodeAt(peg$currPos) === 60) {
-                s1 = peg$c92;
+                s1 = peg$c93;
                 peg$currPos++;
               } else {
                 s1 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e97); }
+                if (peg$silentFails === 0) { peg$fail(peg$e98); }
               }
               if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$f85();
+                s1 = peg$f86();
               }
               s0 = s1;
             }
@@ -3393,7 +3436,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e91); }
+      if (peg$silentFails === 0) { peg$fail(peg$e92); }
     }
 
     return s0;
@@ -3406,7 +3449,7 @@ function peg$parse(input, options) {
     s1 = peg$parseoperator();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f86(s1);
+      s1 = peg$f87(s1);
     }
     s0 = s1;
 
@@ -3424,7 +3467,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e99); }
+      if (peg$silentFails === 0) { peg$fail(peg$e100); }
     }
     if (s2 !== peg$FAILED) {
       while (s2 !== peg$FAILED) {
@@ -3434,7 +3477,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e99); }
+          if (peg$silentFails === 0) { peg$fail(peg$e100); }
         }
       }
     } else {
@@ -3442,13 +3485,13 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f87(s1);
+      s1 = peg$f88(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e98); }
+      if (peg$silentFails === 0) { peg$fail(peg$e99); }
     }
 
     return s0;
@@ -3460,7 +3503,7 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$parse_();
     peg$savedPos = s0;
-    s1 = peg$f88();
+    s1 = peg$f89();
     s0 = s1;
 
     return s0;
@@ -3476,7 +3519,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e101); }
+      if (peg$silentFails === 0) { peg$fail(peg$e102); }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
@@ -3485,12 +3528,12 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e101); }
+        if (peg$silentFails === 0) { peg$fail(peg$e102); }
       }
     }
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e100); }
+    if (peg$silentFails === 0) { peg$fail(peg$e101); }
 
     return s0;
   }
@@ -3500,7 +3543,7 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
-    s1 = peg$f89();
+    s1 = peg$f90();
     if (s1) {
       s1 = undefined;
     } else {
@@ -3537,7 +3580,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e103); }
+      if (peg$silentFails === 0) { peg$fail(peg$e104); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -3546,7 +3589,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e103); }
+        if (peg$silentFails === 0) { peg$fail(peg$e104); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -3554,7 +3597,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e104); }
+      if (peg$silentFails === 0) { peg$fail(peg$e105); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -3563,7 +3606,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e105); }
+        if (peg$silentFails === 0) { peg$fail(peg$e106); }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
@@ -3572,7 +3615,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e105); }
+          if (peg$silentFails === 0) { peg$fail(peg$e106); }
         }
       }
       s4 = input.charAt(peg$currPos);
@@ -3580,7 +3623,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e104); }
+        if (peg$silentFails === 0) { peg$fail(peg$e105); }
       }
       if (s4 !== peg$FAILED) {
         s5 = [];
@@ -3589,7 +3632,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e99); }
+          if (peg$silentFails === 0) { peg$fail(peg$e100); }
         }
         while (s6 !== peg$FAILED) {
           s5.push(s6);
@@ -3598,11 +3641,11 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e99); }
+            if (peg$silentFails === 0) { peg$fail(peg$e100); }
           }
         }
         peg$savedPos = s0;
-        s0 = peg$f90(s1, s3, s5);
+        s0 = peg$f91(s1, s3, s5);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3614,7 +3657,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e102); }
+      if (peg$silentFails === 0) { peg$fail(peg$e103); }
     }
 
     return s0;
@@ -3631,7 +3674,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e103); }
+      if (peg$silentFails === 0) { peg$fail(peg$e104); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -3640,7 +3683,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e103); }
+        if (peg$silentFails === 0) { peg$fail(peg$e104); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -3648,7 +3691,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e104); }
+      if (peg$silentFails === 0) { peg$fail(peg$e105); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -3657,7 +3700,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e105); }
+        if (peg$silentFails === 0) { peg$fail(peg$e106); }
       }
       if (s4 === peg$FAILED) {
         s4 = peg$currPos;
@@ -3673,15 +3716,15 @@ function peg$parse(input, options) {
         }
         if (s5 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 8220) {
-            s6 = peg$c93;
+            s6 = peg$c94;
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e106); }
+            if (peg$silentFails === 0) { peg$fail(peg$e107); }
           }
           if (s6 !== peg$FAILED) {
             peg$savedPos = s4;
-            s4 = peg$f91(s1);
+            s4 = peg$f92(s1);
           } else {
             peg$currPos = s4;
             s4 = peg$FAILED;
@@ -3704,15 +3747,15 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8221) {
-              s6 = peg$c94;
+              s6 = peg$c95;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e107); }
+              if (peg$silentFails === 0) { peg$fail(peg$e108); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f92(s1);
+              s4 = peg$f93(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -3735,15 +3778,15 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 34) {
-                s6 = peg$c95;
+                s6 = peg$c96;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e108); }
+                if (peg$silentFails === 0) { peg$fail(peg$e109); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f93(s1);
+                s4 = peg$f94(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -3762,7 +3805,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e105); }
+          if (peg$silentFails === 0) { peg$fail(peg$e106); }
         }
         if (s4 === peg$FAILED) {
           s4 = peg$currPos;
@@ -3778,15 +3821,15 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8220) {
-              s6 = peg$c93;
+              s6 = peg$c94;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e106); }
+              if (peg$silentFails === 0) { peg$fail(peg$e107); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f91(s1);
+              s4 = peg$f92(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -3809,15 +3852,15 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 8221) {
-                s6 = peg$c94;
+                s6 = peg$c95;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e107); }
+                if (peg$silentFails === 0) { peg$fail(peg$e108); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f92(s1);
+                s4 = peg$f93(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -3840,15 +3883,15 @@ function peg$parse(input, options) {
               }
               if (s5 !== peg$FAILED) {
                 if (input.charCodeAt(peg$currPos) === 34) {
-                  s6 = peg$c95;
+                  s6 = peg$c96;
                   peg$currPos++;
                 } else {
                   s6 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e108); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e109); }
                 }
                 if (s6 !== peg$FAILED) {
                   peg$savedPos = s4;
-                  s4 = peg$f93(s1);
+                  s4 = peg$f94(s1);
                 } else {
                   peg$currPos = s4;
                   s4 = peg$FAILED;
@@ -3864,7 +3907,7 @@ function peg$parse(input, options) {
       s4 = peg$parseclosingQuote();
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f94(s1, s3, s4);
+        s0 = peg$f95(s1, s3, s4);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3876,7 +3919,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e102); }
+      if (peg$silentFails === 0) { peg$fail(peg$e103); }
     }
 
     return s0;
@@ -3891,7 +3934,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e104); }
+      if (peg$silentFails === 0) { peg$fail(peg$e105); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3929,7 +3972,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e109); }
+      if (peg$silentFails === 0) { peg$fail(peg$e110); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -3938,7 +3981,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e109); }
+        if (peg$silentFails === 0) { peg$fail(peg$e110); }
       }
     }
     s2 = [];
@@ -3947,7 +3990,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s3 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e110); }
+      if (peg$silentFails === 0) { peg$fail(peg$e111); }
     }
     while (s3 !== peg$FAILED) {
       s2.push(s3);
@@ -3956,7 +3999,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e110); }
+        if (peg$silentFails === 0) { peg$fail(peg$e111); }
       }
     }
     s3 = [];
@@ -3965,7 +4008,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s4 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e111); }
+      if (peg$silentFails === 0) { peg$fail(peg$e112); }
     }
     while (s4 !== peg$FAILED) {
       s3.push(s4);
@@ -3974,7 +4017,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e111); }
+        if (peg$silentFails === 0) { peg$fail(peg$e112); }
       }
     }
     s4 = peg$parseoperator();
@@ -3993,7 +4036,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e112); }
+        if (peg$silentFails === 0) { peg$fail(peg$e113); }
       }
       while (s2 !== peg$FAILED) {
         s1.push(s2);
@@ -4002,7 +4045,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e112); }
+          if (peg$silentFails === 0) { peg$fail(peg$e113); }
         }
       }
       s2 = peg$currPos;
@@ -4049,7 +4092,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e113); }
+          if (peg$silentFails === 0) { peg$fail(peg$e114); }
         }
       }
     }
@@ -4065,7 +4108,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e114); }
+      if (peg$silentFails === 0) { peg$fail(peg$e115); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
diff --git a/src/libs/SearchParser/baseRules.peggy b/src/libs/SearchParser/baseRules.peggy
index 1a8c6d48e905..792f8b9381f2 100644
--- a/src/libs/SearchParser/baseRules.peggy
+++ b/src/libs/SearchParser/baseRules.peggy
@@ -114,6 +114,7 @@ columnsValues
   / groupWithdrawn
   / groupWithdrawalId
   / groupCategory
+  / groupTag
   / groupMonth
 
 perDiem                 = "per-diem"i &wordBoundary                 { return "perDiem"; }
@@ -139,6 +140,7 @@ groupBankAccount        = "group-bank-account"i &wordBoundary       { return "gr
 groupWithdrawn          = "group-withdrawn"i &wordBoundary          { return "groupWithdrawn"; }
 groupWithdrawalId       = "group-withdrawal-id"i &wordBoundary      { return "groupWithdrawalID"; }
 groupCategory           = "group-category"i &wordBoundary          { return "groupCategory"; }
+groupTag                = "group-tag"i &wordBoundary               { return "groupTag"; }
 groupMonth              = "group-month"i &wordBoundary              { return "groupMonth"; }
 
 
diff --git a/src/libs/SearchParser/searchParser.js b/src/libs/SearchParser/searchParser.js
index dd66d002472e..1bcf04c8cdc6 100644
--- a/src/libs/SearchParser/searchParser.js
+++ b/src/libs/SearchParser/searchParser.js
@@ -271,15 +271,16 @@ function peg$parse(input, options) {
   var peg$c84 = "group-withdrawn";
   var peg$c85 = "group-withdrawal-id";
   var peg$c86 = "group-category";
-  var peg$c87 = "group-month";
-  var peg$c88 = "!=";
-  var peg$c89 = ">=";
-  var peg$c90 = ">";
-  var peg$c91 = "<=";
-  var peg$c92 = "<";
-  var peg$c93 = "\u201C";
-  var peg$c94 = "\u201D";
-  var peg$c95 = "\"";
+  var peg$c87 = "group-tag";
+  var peg$c88 = "group-month";
+  var peg$c89 = "!=";
+  var peg$c90 = ">=";
+  var peg$c91 = ">";
+  var peg$c92 = "<=";
+  var peg$c93 = "<";
+  var peg$c94 = "\u201C";
+  var peg$c95 = "\u201D";
+  var peg$c96 = "\"";
 
   var peg$r0 = /^[^ \t\r\n\xA0]/;
   var peg$r1 = /^[ \t\r\n\xA0,:=<>!]/;
@@ -388,31 +389,32 @@ function peg$parse(input, options) {
   var peg$e89 = peg$literalExpectation("group-withdrawn", true);
   var peg$e90 = peg$literalExpectation("group-withdrawal-id", true);
   var peg$e91 = peg$literalExpectation("group-category", true);
-  var peg$e92 = peg$literalExpectation("group-month", true);
-  var peg$e93 = peg$otherExpectation("operator");
-  var peg$e94 = peg$classExpectation([":", "="], false, false);
-  var peg$e95 = peg$literalExpectation("!=", false);
-  var peg$e96 = peg$literalExpectation(">=", false);
-  var peg$e97 = peg$literalExpectation(">", false);
-  var peg$e98 = peg$literalExpectation("<=", false);
-  var peg$e99 = peg$literalExpectation("<", false);
-  var peg$e100 = peg$otherExpectation("word");
-  var peg$e101 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e102 = peg$otherExpectation("whitespace");
-  var peg$e103 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
-  var peg$e104 = peg$otherExpectation("quote");
-  var peg$e105 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e106 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
-  var peg$e107 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
-  var peg$e108 = peg$literalExpectation("\u201C", false);
-  var peg$e109 = peg$literalExpectation("\u201D", false);
-  var peg$e110 = peg$literalExpectation("\"", false);
-  var peg$e111 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e112 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e113 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
-  var peg$e114 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
-  var peg$e115 = peg$classExpectation([","], false, false);
-  var peg$e116 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false);
+  var peg$e92 = peg$literalExpectation("group-tag", true);
+  var peg$e93 = peg$literalExpectation("group-month", true);
+  var peg$e94 = peg$otherExpectation("operator");
+  var peg$e95 = peg$classExpectation([":", "="], false, false);
+  var peg$e96 = peg$literalExpectation("!=", false);
+  var peg$e97 = peg$literalExpectation(">=", false);
+  var peg$e98 = peg$literalExpectation(">", false);
+  var peg$e99 = peg$literalExpectation("<=", false);
+  var peg$e100 = peg$literalExpectation("<", false);
+  var peg$e101 = peg$otherExpectation("word");
+  var peg$e102 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e103 = peg$otherExpectation("whitespace");
+  var peg$e104 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
+  var peg$e105 = peg$otherExpectation("quote");
+  var peg$e106 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e107 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
+  var peg$e108 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
+  var peg$e109 = peg$literalExpectation("\u201C", false);
+  var peg$e110 = peg$literalExpectation("\u201D", false);
+  var peg$e111 = peg$literalExpectation("\"", false);
+  var peg$e112 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e113 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e114 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
+  var peg$e115 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
+  var peg$e116 = peg$classExpectation([","], false, false);
+  var peg$e117 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false);
 
   var peg$f0 = function(filters) { return applyDefaults(filters); };
   var peg$f1 = function(head, tail) {
@@ -574,33 +576,34 @@ function peg$parse(input, options) {
   var peg$f77 = function() { return "groupWithdrawn"; };
   var peg$f78 = function() { return "groupWithdrawalID"; };
   var peg$f79 = function() { return "groupCategory"; };
-  var peg$f80 = function() { return "groupMonth"; };
-  var peg$f81 = function() { return "eq"; };
-  var peg$f82 = function() { return "neq"; };
-  var peg$f83 = function() { return "gte"; };
-  var peg$f84 = function() { return "gt"; };
-  var peg$f85 = function() { return "lte"; };
-  var peg$f86 = function() { return "lt"; };
-  var peg$f87 = function(o) {
+  var peg$f80 = function() { return "groupTag"; };
+  var peg$f81 = function() { return "groupMonth"; };
+  var peg$f82 = function() { return "eq"; };
+  var peg$f83 = function() { return "neq"; };
+  var peg$f84 = function() { return "gte"; };
+  var peg$f85 = function() { return "gt"; };
+  var peg$f86 = function() { return "lte"; };
+  var peg$f87 = function() { return "lt"; };
+  var peg$f88 = function(o) {
       if (nameOperator) {
         expectingNestedQuote = (o === "eq"); // Use simple parser if no valid operator is found
       }
       isColumnsContext = false;
       return o;
   };
-  var peg$f88 = function(chars) { return chars.join("").trim(); };
-  var peg$f89 = function() { 
+  var peg$f89 = function(chars) { return chars.join("").trim(); };
+  var peg$f90 = function() { 
   isColumnsContext = false;
   return "and";
 };
-  var peg$f90 = function() { return expectingNestedQuote; };
-  var peg$f91 = function(start, inner, end) { //handle no-breaking space
+  var peg$f91 = function() { return expectingNestedQuote; };
+  var peg$f92 = function(start, inner, end) { //handle no-breaking space
       return [...start, '"', ...inner, '"', ...end].join("");
     };
-  var peg$f92 = function(start) {return "“"};
-  var peg$f93 = function(start) {return "”"};
-  var peg$f94 = function(start) {return "\""};
-  var peg$f95 = function(start, inner, end) {
+  var peg$f93 = function(start) {return "“"};
+  var peg$f94 = function(start) {return "”"};
+  var peg$f95 = function(start) {return "\""};
+  var peg$f96 = function(start, inner, end) {
     return [...start, '"', ...inner, '"'].join("");
 };
   var peg$currPos = options.peg$currPos | 0;
@@ -2562,7 +2565,10 @@ function peg$parse(input, options) {
                                           if (s0 === peg$FAILED) {
                                             s0 = peg$parsegroupCategory();
                                             if (s0 === peg$FAILED) {
-                                              s0 = peg$parsegroupMonth();
+                                              s0 = peg$parsegroupTag();
+                                              if (s0 === peg$FAILED) {
+                                                s0 = peg$parsegroupMonth();
+                                              }
                                             }
                                           }
                                         }
@@ -3448,13 +3454,13 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsegroupMonth() {
+  function peg$parsegroupTag() {
     var s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 11);
+    s1 = input.substr(peg$currPos, 9);
     if (s1.toLowerCase() === peg$c87) {
-      peg$currPos += 11;
+      peg$currPos += 9;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e92); }
@@ -3485,6 +3491,43 @@ function peg$parse(input, options) {
     return s0;
   }
 
+  function peg$parsegroupMonth() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 11);
+    if (s1.toLowerCase() === peg$c88) {
+      peg$currPos += 11;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e93); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parsewordBoundary();
+      peg$silentFails--;
+      if (s3 !== peg$FAILED) {
+        peg$currPos = s2;
+        s2 = undefined;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f81();
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
   function peg$parseoperator() {
     var s0, s1;
 
@@ -3495,81 +3538,81 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e94); }
+      if (peg$silentFails === 0) { peg$fail(peg$e95); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f81();
+      s1 = peg$f82();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c88) {
-        s1 = peg$c88;
+      if (input.substr(peg$currPos, 2) === peg$c89) {
+        s1 = peg$c89;
         peg$currPos += 2;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e95); }
+        if (peg$silentFails === 0) { peg$fail(peg$e96); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f82();
+        s1 = peg$f83();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 2) === peg$c89) {
-          s1 = peg$c89;
+        if (input.substr(peg$currPos, 2) === peg$c90) {
+          s1 = peg$c90;
           peg$currPos += 2;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e96); }
+          if (peg$silentFails === 0) { peg$fail(peg$e97); }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f83();
+          s1 = peg$f84();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
           if (input.charCodeAt(peg$currPos) === 62) {
-            s1 = peg$c90;
+            s1 = peg$c91;
             peg$currPos++;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e97); }
+            if (peg$silentFails === 0) { peg$fail(peg$e98); }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$f84();
+            s1 = peg$f85();
           }
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 2) === peg$c91) {
-              s1 = peg$c91;
+            if (input.substr(peg$currPos, 2) === peg$c92) {
+              s1 = peg$c92;
               peg$currPos += 2;
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e98); }
+              if (peg$silentFails === 0) { peg$fail(peg$e99); }
             }
             if (s1 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$f85();
+              s1 = peg$f86();
             }
             s0 = s1;
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
               if (input.charCodeAt(peg$currPos) === 60) {
-                s1 = peg$c92;
+                s1 = peg$c93;
                 peg$currPos++;
               } else {
                 s1 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e99); }
+                if (peg$silentFails === 0) { peg$fail(peg$e100); }
               }
               if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$f86();
+                s1 = peg$f87();
               }
               s0 = s1;
             }
@@ -3580,7 +3623,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e93); }
+      if (peg$silentFails === 0) { peg$fail(peg$e94); }
     }
 
     return s0;
@@ -3593,7 +3636,7 @@ function peg$parse(input, options) {
     s1 = peg$parseoperator();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f87(s1);
+      s1 = peg$f88(s1);
     }
     s0 = s1;
 
@@ -3611,7 +3654,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e101); }
+      if (peg$silentFails === 0) { peg$fail(peg$e102); }
     }
     if (s2 !== peg$FAILED) {
       while (s2 !== peg$FAILED) {
@@ -3621,7 +3664,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e101); }
+          if (peg$silentFails === 0) { peg$fail(peg$e102); }
         }
       }
     } else {
@@ -3629,13 +3672,13 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f88(s1);
+      s1 = peg$f89(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e100); }
+      if (peg$silentFails === 0) { peg$fail(peg$e101); }
     }
 
     return s0;
@@ -3647,7 +3690,7 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$parse_();
     peg$savedPos = s0;
-    s1 = peg$f89();
+    s1 = peg$f90();
     s0 = s1;
 
     return s0;
@@ -3663,7 +3706,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e103); }
+      if (peg$silentFails === 0) { peg$fail(peg$e104); }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
@@ -3672,12 +3715,12 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e103); }
+        if (peg$silentFails === 0) { peg$fail(peg$e104); }
       }
     }
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e102); }
+    if (peg$silentFails === 0) { peg$fail(peg$e103); }
 
     return s0;
   }
@@ -3687,7 +3730,7 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
-    s1 = peg$f90();
+    s1 = peg$f91();
     if (s1) {
       s1 = undefined;
     } else {
@@ -3724,7 +3767,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e105); }
+      if (peg$silentFails === 0) { peg$fail(peg$e106); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -3733,7 +3776,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e105); }
+        if (peg$silentFails === 0) { peg$fail(peg$e106); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -3741,7 +3784,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e106); }
+      if (peg$silentFails === 0) { peg$fail(peg$e107); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -3750,7 +3793,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e107); }
+        if (peg$silentFails === 0) { peg$fail(peg$e108); }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
@@ -3759,7 +3802,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e107); }
+          if (peg$silentFails === 0) { peg$fail(peg$e108); }
         }
       }
       s4 = input.charAt(peg$currPos);
@@ -3767,7 +3810,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e106); }
+        if (peg$silentFails === 0) { peg$fail(peg$e107); }
       }
       if (s4 !== peg$FAILED) {
         s5 = [];
@@ -3776,7 +3819,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e101); }
+          if (peg$silentFails === 0) { peg$fail(peg$e102); }
         }
         while (s6 !== peg$FAILED) {
           s5.push(s6);
@@ -3785,11 +3828,11 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e101); }
+            if (peg$silentFails === 0) { peg$fail(peg$e102); }
           }
         }
         peg$savedPos = s0;
-        s0 = peg$f91(s1, s3, s5);
+        s0 = peg$f92(s1, s3, s5);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3801,7 +3844,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$e105); }
     }
 
     return s0;
@@ -3818,7 +3861,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e105); }
+      if (peg$silentFails === 0) { peg$fail(peg$e106); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -3827,7 +3870,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e105); }
+        if (peg$silentFails === 0) { peg$fail(peg$e106); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -3835,7 +3878,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e106); }
+      if (peg$silentFails === 0) { peg$fail(peg$e107); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -3844,7 +3887,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e107); }
+        if (peg$silentFails === 0) { peg$fail(peg$e108); }
       }
       if (s4 === peg$FAILED) {
         s4 = peg$currPos;
@@ -3860,15 +3903,15 @@ function peg$parse(input, options) {
         }
         if (s5 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 8220) {
-            s6 = peg$c93;
+            s6 = peg$c94;
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e108); }
+            if (peg$silentFails === 0) { peg$fail(peg$e109); }
           }
           if (s6 !== peg$FAILED) {
             peg$savedPos = s4;
-            s4 = peg$f92(s1);
+            s4 = peg$f93(s1);
           } else {
             peg$currPos = s4;
             s4 = peg$FAILED;
@@ -3891,15 +3934,15 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8221) {
-              s6 = peg$c94;
+              s6 = peg$c95;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e109); }
+              if (peg$silentFails === 0) { peg$fail(peg$e110); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f93(s1);
+              s4 = peg$f94(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -3922,15 +3965,15 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 34) {
-                s6 = peg$c95;
+                s6 = peg$c96;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e110); }
+                if (peg$silentFails === 0) { peg$fail(peg$e111); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f94(s1);
+                s4 = peg$f95(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -3949,7 +3992,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e107); }
+          if (peg$silentFails === 0) { peg$fail(peg$e108); }
         }
         if (s4 === peg$FAILED) {
           s4 = peg$currPos;
@@ -3965,15 +4008,15 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8220) {
-              s6 = peg$c93;
+              s6 = peg$c94;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e108); }
+              if (peg$silentFails === 0) { peg$fail(peg$e109); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f92(s1);
+              s4 = peg$f93(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -3996,15 +4039,15 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 8221) {
-                s6 = peg$c94;
+                s6 = peg$c95;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e109); }
+                if (peg$silentFails === 0) { peg$fail(peg$e110); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f93(s1);
+                s4 = peg$f94(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -4027,15 +4070,15 @@ function peg$parse(input, options) {
               }
               if (s5 !== peg$FAILED) {
                 if (input.charCodeAt(peg$currPos) === 34) {
-                  s6 = peg$c95;
+                  s6 = peg$c96;
                   peg$currPos++;
                 } else {
                   s6 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e110); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e111); }
                 }
                 if (s6 !== peg$FAILED) {
                   peg$savedPos = s4;
-                  s4 = peg$f94(s1);
+                  s4 = peg$f95(s1);
                 } else {
                   peg$currPos = s4;
                   s4 = peg$FAILED;
@@ -4051,7 +4094,7 @@ function peg$parse(input, options) {
       s4 = peg$parseclosingQuote();
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f95(s1, s3, s4);
+        s0 = peg$f96(s1, s3, s4);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4063,7 +4106,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$e105); }
     }
 
     return s0;
@@ -4078,7 +4121,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e106); }
+      if (peg$silentFails === 0) { peg$fail(peg$e107); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4116,7 +4159,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e111); }
+      if (peg$silentFails === 0) { peg$fail(peg$e112); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -4125,7 +4168,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e111); }
+        if (peg$silentFails === 0) { peg$fail(peg$e112); }
       }
     }
     s2 = [];
@@ -4134,7 +4177,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s3 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e112); }
+      if (peg$silentFails === 0) { peg$fail(peg$e113); }
     }
     while (s3 !== peg$FAILED) {
       s2.push(s3);
@@ -4143,7 +4186,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e112); }
+        if (peg$silentFails === 0) { peg$fail(peg$e113); }
       }
     }
     s3 = [];
@@ -4152,7 +4195,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s4 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e113); }
+      if (peg$silentFails === 0) { peg$fail(peg$e114); }
     }
     while (s4 !== peg$FAILED) {
       s3.push(s4);
@@ -4161,7 +4204,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e113); }
+        if (peg$silentFails === 0) { peg$fail(peg$e114); }
       }
     }
     s4 = peg$parseoperator();
@@ -4180,7 +4223,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e114); }
+        if (peg$silentFails === 0) { peg$fail(peg$e115); }
       }
       while (s2 !== peg$FAILED) {
         s1.push(s2);
@@ -4189,7 +4232,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e114); }
+          if (peg$silentFails === 0) { peg$fail(peg$e115); }
         }
       }
       s2 = peg$currPos;
@@ -4236,7 +4279,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e115); }
+          if (peg$silentFails === 0) { peg$fail(peg$e116); }
         }
       }
     }
@@ -4252,7 +4295,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e116); }
+      if (peg$silentFails === 0) { peg$fail(peg$e117); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
@@ -4282,6 +4325,7 @@ function peg$parse(input, options) {
     card: "card",
     "withdrawal-id": "withdrawn",
     category: "category",
+    tag: "tag",
     month: "groupmonth",
   };
 
@@ -4290,6 +4334,7 @@ function peg$parse(input, options) {
     card: "asc",
     "withdrawal-id": "desc",
     category: "asc",
+    tag: "asc",
     month: "desc"
   };
 
diff --git a/src/libs/SearchParser/searchParser.peggy b/src/libs/SearchParser/searchParser.peggy
index 9dc46092f4cf..f922d3835d20 100644
--- a/src/libs/SearchParser/searchParser.peggy
+++ b/src/libs/SearchParser/searchParser.peggy
@@ -33,6 +33,7 @@
     card: "card",
     "withdrawal-id": "withdrawn",
     category: "category",
+    tag: "tag",
     month: "groupmonth",
   };
 
@@ -41,6 +42,7 @@
     card: "asc",
     "withdrawal-id": "desc",
     category: "asc",
+    tag: "asc",
     month: "desc"
   };