diff --git a/rowers/templates/user_analysis_select.html b/rowers/templates/user_analysis_select.html
index 37974888..81bfc7df 100644
--- a/rowers/templates/user_analysis_select.html
+++ b/rowers/templates/user_analysis_select.html
@@ -309,12 +309,25 @@
     <p>TIP: Agree with your team members to put tags (e.g. '8x500m') in the notes section of
       your workouts. That makes it easy to search.</p>
   </li>
-  <li class="grid_2 maxheight">
-    <form id="searchform" action=""
-          method="get" accept-charset="utf-8">
+	<li class="grid_2">
+    <form enctype="multipart/form-data" method="post">
+      <table>
+        {{ dateform.as_table }}
+      </table>
+      <table>
+        {{ optionsform.as_table }}
+      </table>
+  </li>
+  <li class="grid_2">
+    <p>Select two or more workouts, set your plot settings below,
+      and press submit
+    </p>
+    <table>
+      {{ chartform.as_table }}
+    </table>
+  </li>
+	<li class="grid_2 maxheight">
       {{ searchform }}
-      <input type="submit" value="GO"></input>
-    </form>
     <form enctype="multipart/form-data" action="" method="post">
 
       {% if workouts %}
@@ -326,27 +339,9 @@
       {% else %}
       <p> No workouts found </p>
       {% endif %}
-  </li>
-  <li class="grid_2">
-    <p>Select two or more workouts, set your plot settings below,
-      and press submit
-    </p>
-    {% csrf_token %}
-    <table>
-      {{ chartform.as_table }}
-    </table>
-  </li>
-  <li class="grid_2">
-    <form enctype="multipart/form-data" method="post">
-      <table>
-        {{ dateform.as_table }}
-      </table>
-      <table>
-        {{ optionsform.as_table }}
-      </table>
-      {% csrf_token %}
-      <input name='optionsform' type="submit" value="Submit">
-    </form>
+			{% csrf_token %}
+			<input name='optionsform' type="submit" value="Submit">
+		</form>
   </li>
 </ul>
 
diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index 43b2563b..aa8cce9d 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -197,7 +197,7 @@ def analysis_new(request,userid=0,function='boxplot',teamid=0):
     if rankingonly:
         workouts = workouts.exclude(rankingpiece=False)
 
-    query = request.GET.get('q')
+    query = request.POST.get('q')
     if query:
         query_list = query.split()
         workouts = workouts.filter(