Fix url space handling