diff --git a/stacktach/views.py b/stacktach/views.py
index ef81716..96c0712 100644
--- a/stacktach/views.py
+++ b/stacktach/views.py
@@ -476,7 +476,9 @@ def search(request, deployment_id):
         rows = rows.filter(**{column: value})
         if not updates:
             rows = rows.exclude(event='compute.instance.update')
-        rows = rows.order_by('-when')[:int(count)]
+        rows = rows.order_by('-when')
+        if count != 'All':
+            rows = rows[:int(count)]
         _post_process_raw_data(rows)
     c['rows'] = rows
     c['allow_expansion'] = True
diff --git a/templates/index.html b/templates/index.html
index 65a20ea..2b84856 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -61,10 +61,10 @@ function search_form(deployment_id)
         <input type='text' id='query' size='60' value=''/>
         Include Updates: <input type='checkbox' id="updates" checked />
         <select id='count'>
-            <option>10
-            <option selected>20
-            <option>50
+            <option selected>25
             <option>100
+            <option>250
+            <option>All
         </select>
         <input type='submit' value='Search' onclick='return search_form({{deployment_id}});'/>
         </form>