Url fixes

continue 3d7a72e0d74bdac125834e2c931ff1ea3e72500d