Add back support for whitespaces in URLs removed in aa4ac33a