Merge "Fixed bug with url building"