diff --git a/gracedb/query.py b/gracedb/query.py
index 3da3accbf0743bd7d4c661b37e4c1b7a46b16c29..dc54add8a2e0575bea27083c31f8ada0ec745332 100644
--- a/gracedb/query.py
+++ b/gracedb/query.py
@@ -245,8 +245,10 @@ def parseQuery(s):
         d["tid"] = d["tid"] & Q(group__name="Test")
     if "hid" in d:
         d["hid"] = d["hid"] & Q(analysisType="HWINJ")
+    if "eid" in d:
+        d["eid"] = d["eid"] & Q(analysisType="GRB")
     if "id" in d:
-        d["id"] = d["id"] & ~Q(analysisType="HWINJ")
+        d["id"] = d["id"] & ~Q(analysisType="HWINJ") & ~Q(analysisType="GRB")
     if "id" in d and "hid" in d:
         d["id"] = d["id"] | d["hid"]
         del d["hid"]