improve selection support