- Improved highlight behavior.