Defensively fixing raw spaces in URLs, #346