Make resolve_url() use track()