fixed bug with site id resolution