Currently, it is just filtering on event_target. Add event_type as well.
Currently, it is just filtering on event_target. Add event_type as well.