diff --git a/lib/logstash/filters/base.rb b/lib/logstash/filters/base.rb
index 374084475..2104f0803 100644
--- a/lib/logstash/filters/base.rb
+++ b/lib/logstash/filters/base.rb
@@ -54,7 +54,7 @@ class LogStash::Filters::Base < LogStash::Plugin
   end # def register
 
   public
-  def filter(event)
+  def filter(event, input_queue)
     raise "#{self.class}#filter must be overidden"
   end # def filter
 
diff --git a/lib/logstash/filters/date.rb b/lib/logstash/filters/date.rb
index c90d32293..d84f05977 100644
--- a/lib/logstash/filters/date.rb
+++ b/lib/logstash/filters/date.rb
@@ -176,8 +176,7 @@ class LogStash::Filters::Date < LogStash::Filters::Base
       end # fieldvalue.each 
     end # @parsers.each
 
-    if !event.cancelled?
-      filter_matched(event)
-    end
+    filter_matched(event) if !event.cancelled?
+    return event
   end # def filter
 end # class LogStash::Filters::Date
diff --git a/lib/logstash/filters/grep.rb b/lib/logstash/filters/grep.rb
index 14eeee184..7c08b9c50 100644
--- a/lib/logstash/filters/grep.rb
+++ b/lib/logstash/filters/grep.rb
@@ -100,8 +100,6 @@ class LogStash::Filters::Grep < LogStash::Filters::Base
 
     @logger.debug(["Event after grep filter", event.to_hash])
 
-    if !event.cancelled?
-      filter_matched(event)
-    end
+    filter_matched(event) if !event.cancelled?
   end # def filter
 end # class LogStash::Filters::Grep
diff --git a/lib/logstash/filters/grok.rb b/lib/logstash/filters/grok.rb
index 9605ef737..f72a5ce19 100644
--- a/lib/logstash/filters/grok.rb
+++ b/lib/logstash/filters/grok.rb
@@ -234,6 +234,7 @@ class LogStash::Filters::Grok < LogStash::Filters::Base
     end
 
     @logger.debug(["Event now: ", event.to_hash])
+    filter_matched(event) if !event.cancelled?
   end # def filter
 
   private
diff --git a/lib/logstash/filters/grokdiscovery.rb b/lib/logstash/filters/grokdiscovery.rb
index 4189e97ef..40577ebf8 100644
--- a/lib/logstash/filters/grokdiscovery.rb
+++ b/lib/logstash/filters/grokdiscovery.rb
@@ -65,5 +65,7 @@ class LogStash::Filters::Grokdiscovery < LogStash::Filters::Base
       @logger.debug(event.to_hash)
     end
     @logger.debug(["Event now: ", event.to_hash])
+
+    filter_matched(event) if !event.cancelled?
   end # def filter
 end # class LogStash::Filters::Grokdiscovery
diff --git a/lib/logstash/filters/multiline.rb b/lib/logstash/filters/multiline.rb
index 029b7b292..4916812b1 100644
--- a/lib/logstash/filters/multiline.rb
+++ b/lib/logstash/filters/multiline.rb
@@ -158,6 +158,7 @@ class LogStash::Filters::Multiline < LogStash::Filters::Base
     if !event.cancelled?
       filter_matched(event)
     end
+    filter_matched(event) if !event.cancelled?
   end # def filter
 
   # flush any pending messages