added option to filter on event types