do a better job with default_origin_server; fix update