use the link returned by server rather than building our own

- This code is simpler, and general enough to work in all the cities.
Merge branch 'intercityalization'