Better handling of URLs with invalid characters - like spaces