Updating the remaining locations where the baseurl might be used.