improve selector events