Added filter based on events subscribed