diff --git a/addon/mixins/modal-base.coffee b/addon/mixins/modal-base.coffee
index e46105d..700047a 100644
--- a/addon/mixins/modal-base.coffee
+++ b/addon/mixins/modal-base.coffee
@@ -79,8 +79,8 @@ export default Ember.Component.extend
       @send 'closeModal' unless @preventClose
     confirm: -> @send('ok')
     saveRecord: ->
-      return if @get('is_saving')
-      @set 'is_saving', true # prevent click enthusiasts from creating to many instances or things like that
+      return if @get('is_saving') # prevent click enthusiasts from creating to many instances or things like that
+      @set 'is_saving', true
       model = @get("model")
       if typeof model.validate is 'function'
         model.validate() # validate if method exists
diff --git a/app/components/table-filters.coffee b/app/components/table-filters.coffee
index c89b29f..7e7d87d 100644
--- a/app/components/table-filters.coffee
+++ b/app/components/table-filters.coffee
@@ -22,6 +22,7 @@ export default Ember.Component.extend
         filter_calls = @incrementProperty('filter_calls')
         console.log "QUERY"
         console.log query
+        return unless @get('content') # assume observed filters
         @set 'content.page', 1
         @set 'content.lastPage', null
         @get('content').setOtherParam?('q', query)