Fix context search