fix to site_search, using new context
merging with master