Fix problem with spaces in url
Not much done