Improve selection behavior.