fix #2711 using a custom event, also use css selectors over filterAttr