fix bugs relatives to fallback-timeout and original-upstreams