Selection improvements.