diff --git a/gracedb/views.py b/gracedb/views.py
index 2789ed3325ccec158c16f8de24a2acd49aa2e7cc..14bf006d35f1259ab48dd0dda52e8ce18944b586 100644
--- a/gracedb/views.py
+++ b/gracedb/views.py
@@ -591,11 +591,11 @@ def search(request, format=""):
                 return flexigridResponse(request, objects)
             elif format == "jqgrid":
                 return jqgridResponse(request, objects)
-            elif 'ligolw' in request.POST:
+            elif 'ligolw' in request.POST or 'ligolw' in request.GET:
 
                 if objects.count() > 1000:
                     # XXX  Make this -- Better.
-                    return HttpResponse("No more than 1000 events currently allowed.")
+                    return HttpResponse("Sorry -- no more than 1000 events currently allowed.")
 
                 from glue.ligolw import ligolw
                 # lsctables MUST be loaded before utils.
diff --git a/templates/gracedb/event_list.html b/templates/gracedb/event_list.html
index da604203382261971c792632c262ff54d2702458..6d359639737ba0d2625a5a1b3ae624bbd451ef85 100644
--- a/templates/gracedb/event_list.html
+++ b/templates/gracedb/event_list.html
@@ -110,6 +110,7 @@
                 <a onClick="toggle_visibility('hints');">Hints on querying</a>
                 {% if rawquery %}
                     | <a href="{% url search %}?query={{rawquery|urlencode}}">Link to current query</a>
+                    | <a href="{% url search %}?query={{rawquery|urlencode}}&ligolw">Download LIGOLW File</a>
                 {% endif %}
             </td>
         </tr>
diff --git a/templates/gracedb/query.html b/templates/gracedb/query.html
index 7cf2fce80288e7855a6890f43558b6a4bfc4108e..4b98202dfde9d0868af96a14eb9b125cde079c80 100644
--- a/templates/gracedb/query.html
+++ b/templates/gracedb/query.html
@@ -31,8 +31,6 @@ onload="document.search_form.query.focus();"
     </tr>
     <tr><td/><td>{% include "gracedb/query_help_frag.html" %}</td></tr>
   </table>
-  <input type="Submit" name="submit" value="Submit"/>
-  <input type="Submit" name="ligolw" value="LigoLW"/>
 </form>
 
 <!-- Old style Query -->