diff --git a/heka/files/toml/filter/afd_alarm.toml b/heka/files/toml/filter/afd_alarm.toml
index 5fefb2d..9da7248 100644
--- a/heka/files/toml/filter/afd_alarm.toml
+++ b/heka/files/toml/filter/afd_alarm.toml
@@ -2,7 +2,7 @@
 type = "SandboxFilter"
 filename = "/usr/share/lma_collector/filters/afd.lua"
 preserve_data = {{ alarm.preserve_data|default(False)|lower }}
-message_matcher = "(Type == 'metric' || Type == 'heka.sandbox.metric') && ({{ salt['heka_alarming.alarm_message_matcher'](alarm, trigger) }})"
+message_matcher = "Type =~ /metric$/ && ({{ salt['heka_alarming.alarm_message_matcher'](alarm, trigger) }})"
 module_directory = "/usr/share/lma_collector/common;/usr/share/heka/lua_modules"
 ticker_interval = 10
 
diff --git a/heka/meta/heka.yml b/heka/meta/heka.yml
index 321d894..d9df152 100644
--- a/heka/meta/heka.yml
+++ b/heka/meta/heka.yml
@@ -397,8 +397,8 @@
           arguments: [ down, critical, warning, unknown ]
           relational_operator: '>'
           threshold: 0
-          function: percent      
-    - status: okay  
+          function: percent
+    - status: okay
   input:
     heka_metric:
       engine: tcp