Improve active selector