Fixed Map News / Events / Clubs State Management issues