Temporarily fix context search