- Fix siteId() to work with new API