Changing the base url is now handled better.