use url tags instead of constructing by hand

this won't work on non-hq deployments, but it never would have in the
first place.