handling SiteId wrapped in object as well as non-wrapped