diff --git a/analytics/logstash/logstash.conf b/analytics/logstash/logstash.conf
index 29af3d08..9419033a 100644
--- a/analytics/logstash/logstash.conf
+++ b/analytics/logstash/logstash.conf
@@ -27,7 +27,7 @@ filter {
 
           map['userid'] ||= event.get('userid');
           map['application'] ||= event.get('application');
-          map['message'] ||= event.get('message');
+          map['error'] ||= event.get('message');
           map['filename'] ||= event.get('filename');
           map['line'] ||= event.get('line');
           map['task'] ||= event.get('task');
@@ -35,12 +35,11 @@ filter {
           map['error_count'] ||= 0;
           map['error_count'] += 1;
 
-          map['aggregated_message'] ||= '';
-          time = Time.strptime(event.get('timestamp').to_s,'%Q').localtime('+03:00')
-          map['aggregated_message'] += time.to_s + '\n' +  event.get('stack') + '\n\n\n';"
+          map['aggregated_stack'] ||= '';
+          map['aggregated_stack'] += event.get('stack') + '\n\n\n';"
 
-        timeout => 3600
-        timeout_tags => ['send_email_notification']
+        timeout => 3
+        timeout_tags => ['aggregated_exception']
         push_map_as_event_on_timeout => true
       }
     }