Filter for event, and bugfix