Implement SHERPA-327 - Highlight search results