Tweaked matching text highlight based on NJ's feedback.