Tweak url building, fix whitespace.