Fix for search result navigation issue