clean up baseurl issue