Improved selection tracking.