Make url safe (without spaces)

Change-Id: Idbd67431060e3668b8f5f4e6243e5dbcc9f718d0