Fixed not including siteId in URI paths