Changes remote query API to avoid argument name collision.