Fixed issues with site.url