[Refactoring] SiteService membership + favorite