Attempt to fix the mess with non unique site ids (now site urls)