Add filters to Events (not ready for production yet)