Removed site.url override
Replaced site.url with site.canonical