added context-aware highlighting