Optimized highlighting