Optimized matching to make highlighting less cluttered and easier to customize.