Update to url.format changes