Make selection work better on switcher.