Fix error in url calculation, also account for variants changing the URL