improve ofAddEventlistener selection