Improved search result highlighting