Doc update
Improve match highlighting