Updated highlighting with multiple words