Smarter highlighting