Issue #7: Improve the search result context display