improve highlighting of search results. improvements towards #311