Fix remote search (#1857)