Better selection handling.