better management of setting current-selection