Added filtering for events/activities