fixing baseurl issues