Minor bug fixes in get_tracking_url