diff --git a/gracedb/query.py b/gracedb/query.py
index c6420c7319d3c1d09f55f41eafe5e95811295385..c00f64ed1310dabadc0320abf31980d33619255e 100644
--- a/gracedb/query.py
+++ b/gracedb/query.py
@@ -122,7 +122,7 @@ eidQ = Optional(Suppress(Keyword("eid:"))) + (eid^eidRange)
 eidQ = eidQ.setParseAction(maybeRange("eid", dbname="id"))
 
 # Submitter
-submitter = QuotedString('"').setParseAction(lambda toks: Q(submitter__name=toks[0]))
+submitter = QuotedString('"').setParseAction(lambda toks: Q(submitter__username=toks[0]))
 submitterQ = Optional(Suppress(Keyword("submitter:"))) + submitter
 submitterQ = submitterQ.setParseAction(lambda toks: ("submitter", toks[0]))
 
diff --git a/templates/gracedb/query_help_frag.html b/templates/gracedb/query_help_frag.html
index a13a7289e0670115d40e63e7f7e7f194735555d3..abe924f255f2dfb5413b4e4d0a5dac8af7636329 100644
--- a/templates/gracedb/query_help_frag.html
+++ b/templates/gracedb/query_help_frag.html
@@ -55,11 +55,13 @@
 
  <h4>By Submitter</h4>
   To specify events from a given submitter, indicate the name of the submitter in double quotes.
-  The <code>submitter:</code> is optional.
+  The <code>submitter:</code> is optional.  While LIGO user names are predictable, most events
+  are submitted through robot accounts and are not as predictable.  This is probably a defect
+  that ought to be remedied.
   <ul>
-    <li>"CWB Analysis"
-    <li>"CWB Analysis" "Omega Analysis"
-    <li>submitter: "Joss Whedon" submitter: "Gilligan"
+    <li>"waveburst"
+    <li>"gstlalcbc"  "gdb-processor"
+    <li>submitter: "joss.whedon@ligo.org" submitter: "gdb_processor"
   </ul>
 
 </div>