diff --git a/PadelClub/Views/Tournament/Screen/TableStructureView.swift b/PadelClub/Views/Tournament/Screen/TableStructureView.swift
index 60a6120..4d3e783 100644
--- a/PadelClub/Views/Tournament/Screen/TableStructureView.swift
+++ b/PadelClub/Views/Tournament/Screen/TableStructureView.swift
@@ -109,16 +109,16 @@ struct TableStructureView: View {
                         
                         if structurePreset == .manual {
                             LabeledContent {
-                                StepperView(count: $qualifiedPerGroupStage, minimum: 1, maximum: (teamsPerGroupStage-1))
+                                StepperView(count: $qualifiedPerGroupStage, minimum: 0, maximum: (teamsPerGroupStage-1))
                             } label: {
-                                Text("Qualifiés par poule")
+                                Text("Qualifié\(qualifiedPerGroupStage.pluralSuffix) par poule")
                             }
                             
                             if qualifiedPerGroupStage < teamsPerGroupStage - 1 {
                                 LabeledContent {
-                                    StepperView(count: $groupStageAdditionalQualified, minimum: 0, maximum: maxMoreQualified)
+                                    StepperView(count: $groupStageAdditionalQualified, minimum: 1, maximum: maxMoreQualified)
                                 } label: {
-                                    Text("Qualifiés supplémentaires")
+                                    Text("Qualifié\(groupStageAdditionalQualified.pluralSuffix) supplémentaires")
                                     Text(moreQualifiedLabel)
                                 }
                                 .onChange(of: groupStageAdditionalQualified) {
diff --git a/PadelClub/Views/Tournament/Shared/TournamentCellView.swift b/PadelClub/Views/Tournament/Shared/TournamentCellView.swift
index 62c22d1..ed82548 100644
--- a/PadelClub/Views/Tournament/Shared/TournamentCellView.swift
+++ b/PadelClub/Views/Tournament/Shared/TournamentCellView.swift
@@ -11,7 +11,6 @@ import LeStorage
 struct TournamentCellView: View {
     @EnvironmentObject var dataStore: DataStore
     @Environment(NavigationViewModel.self) private var navigation
-    @Environment(FederalDataViewModel.self) var federalDataViewModel: FederalDataViewModel
 
     let tournament: FederalTournamentHolder
 //    let color: Color = .black
@@ -25,7 +24,7 @@ struct TournamentCellView: View {
     var body: some View {
         ForEach(tournament.tournaments, id: \.id) { build in
             if let federalTournament = tournament as? FederalTournament {
-                if federalDataViewModel.isFederalTournamentValidForFilters(federalTournament, build: build) {
+                if FederalDataViewModel.shared.isFederalTournamentValidForFilters(federalTournament, build: build) {
                     if navigation.agendaDestination == .around {
                         NavigationLink {
                             TournamentSubscriptionView(federalTournament: federalTournament, build: build, user: dataStore.user)