[Redesign] Update club indexes