improve selector and event