Updated event listener filter