Fix site.baseurl related issue