diff --git a/rowers/templates/user_multiflex_select.html b/rowers/templates/user_multiflex_select.html
index 2e0ede5c..9d553b5d 100644
--- a/rowers/templates/user_multiflex_select.html
+++ b/rowers/templates/user_multiflex_select.html
@@ -78,6 +78,32 @@
     <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">
+    {% if theuser %}
+    <form enctype="multipart/form-data" action="/rowers/user-multiflex-select/user/{{ theuser.id }}/" method="post">
+      {% else %}
+      <form enctype="multipart/form-data" action="/rowers/user-multiflex-select/" method="post">
+        {% endif %}
+  
+        <table>
+          {{ dateform.as_table }}
+        </table>
+        <table>
+          {{ modalityform.as_table }}
+        </table>
+        {% csrf_token %}
+        <input name='modalityform' class="button green" type="submit" value="Filter">
+      </form>
+  </li>
+  <li class="grid_2">
+    <form id="searchform" action=""
+          method="get" accept-charset="utf-8">
+      <input class="searchfield" id="searchbox" name="q" type="text" placeholder="Search">
+      <button class="button blue small" type="submit">
+        Search
+      </button>
+    </form>
+  </li>
   <li class="grid_2 maxheight">
     <form enctype="multipart/form-data" action="/rowers/user-multiflex/user/{{ theuser.id }}" method="post">
   {% if workouts %}
@@ -96,36 +122,10 @@
     {{ chartform.as_table }}
   </table>
   <p>
-    <input name='workoutselectform' class="button green" type="submit" value="Submit">
+    <input name='workoutselectform' class="button green" type="submit" value="Create Chart">
   </p>
   </form>
 </li>
-  <li class="grid_2">
-    {% if theuser %}
-    <form enctype="multipart/form-data" action="/rowers/user-multiflex-select/user/{{ theuser.id }}/" method="post">
-      {% else %}
-      <form enctype="multipart/form-data" action="/rowers/user-multiflex-select/" method="post">
-        {% endif %}
-  
-        <table>
-          {{ dateform.as_table }}
-        </table>
-        <table>
-          {{ modalityform.as_table }}
-        </table>
-        {% csrf_token %}
-        <input name='modalityform' class="button green" type="submit" value="Submit">
-      </form>
-  </li>
-  <li class="grid_2">
-    <form id="searchform" action=""
-          method="get" accept-charset="utf-8">
-      <input class="searchfield" id="searchbox" name="q" type="text" placeholder="Search">
-      <button class="button blue small" type="submit">
-        Search
-      </button>
-    </form>
-  </li>
 
 </ul>
 
diff --git a/rowers/views.py b/rowers/views.py
index 18b4a60e..75754ac2 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -5655,8 +5655,10 @@ def user_multiflex_select(request,
     if 'enddate' in request.session:
         enddate = iso8601.parse_date(request.session['enddate'])
 
-
-        waterboattype = request.session['waterboattype']
+        try:
+            waterboattype = request.session['waterboattype']
+        except KeyError:
+            waterboattype = mytypes.waterboattype
     else:
         waterboattype = mytypes.waterboattype