Fix SiteId after change of Id strategy