Improve selection/deselection.