Improved selection highlighting