Issue #7: corrections for showing the context of the search results