simplify find
currentSiteId -> currentSite.Id