More selection tweaks