fixing baseurl and url