Improve the highlighting of search matches