Fixed handling of sites and siteDotCom