diff --git a/addon/controllers/action-list.coffee b/addon/controllers/action-list.coffee
index a40e470..ef5089d 100644
--- a/addon/controllers/action-list.coffee
+++ b/addon/controllers/action-list.coffee
@@ -7,11 +7,13 @@ export default Ember.Controller.extend
   scope_project: null
   scope_scenario: null
   scope_organization: null
-  show_completed_at: Ember.computed 'filters.state_in.[]', 'filters.completed_at_gteq', 'filters.completed_at_lteq', ->
+  show_completed_at: Ember.computed 'filters.state_in.[]', 'filters.completed_at_gteq', 'filters.completed_at_lteq', 'filters.s', ->
     return true if @get('filters.completed_at_lteq') or @get('filters.completed_at_gteq')
+    return true if /^completed_at/.test @get('filters.s')
     JSON.stringify(@get('filters.state_in')) is '["completed"]'
-  show_inquiry_at: Ember.computed 'filters.state_in.[]', 'filters.inquiry_at_gteq', 'filters.inquiry_at_lteq', ->
+  show_inquiry_at: Ember.computed 'filters.state_in.[]', 'filters.inquiry_at_gteq', 'filters.inquiry_at_lteq', 'filters.s', ->
     return true if @get('filters.inquiry_at_lteq') or @get('filters.inquiry_at_gteq')
+    return true if /^inquiry_at/.test @get('filters.s')
     JSON.stringify(@get('filters.state_in')) is '["inquiry"]'
   filter_query: Ember.computed 'filters.filter_calls', ->
     @get('filters')?.toProperties() || {}
diff --git a/addon/controllers/action-list.js b/addon/controllers/action-list.js
index ec904a4..1f7b91b 100644
--- a/addon/controllers/action-list.js
+++ b/addon/controllers/action-list.js
@@ -9,16 +9,22 @@ export default Ember.Controller.extend({
   scope_project: null,
   scope_scenario: null,
   scope_organization: null,
-  show_completed_at: Ember.computed('filters.state_in.[]', 'filters.completed_at_gteq', 'filters.completed_at_lteq', function() {
+  show_completed_at: Ember.computed('filters.state_in.[]', 'filters.completed_at_gteq', 'filters.completed_at_lteq', 'filters.s', function() {
     if (this.get('filters.completed_at_lteq') || this.get('filters.completed_at_gteq')) {
       return true;
     }
+    if (/^completed_at/.test(this.get('filters.s'))) {
+      return true;
+    }
     return JSON.stringify(this.get('filters.state_in')) === '["completed"]';
   }),
-  show_inquiry_at: Ember.computed('filters.state_in.[]', 'filters.inquiry_at_gteq', 'filters.inquiry_at_lteq', function() {
+  show_inquiry_at: Ember.computed('filters.state_in.[]', 'filters.inquiry_at_gteq', 'filters.inquiry_at_lteq', 'filters.s', function() {
     if (this.get('filters.inquiry_at_lteq') || this.get('filters.inquiry_at_gteq')) {
       return true;
     }
+    if (/^inquiry_at/.test(this.get('filters.s'))) {
+      return true;
+    }
     return JSON.stringify(this.get('filters.state_in')) === '["inquiry"]';
   }),
   filter_query: Ember.computed('filters.filter_calls', function() {