PLF-4366: unified search: SearchContext improvement