improve selection management