diff --git a/PadelClubData/Data/Event.swift b/PadelClubData/Data/Event.swift
index 210c5f7..57db29a 100644
--- a/PadelClubData/Data/Event.swift
+++ b/PadelClubData/Data/Event.swift
@@ -87,6 +87,14 @@ final public class Event: BaseEvent {
         })
     }
     
+    public func federalTournaments() -> [Tournament] {
+        tournaments.filter({ $0.isAnimation() == false && $0.isCanceled == false && $0.isDeleted == false })
+    }
+    
+    public func paidTournaments() -> [Tournament] {
+        tournaments.filter({ $0.isFree() == false && $0.isCanceled == false && $0.isDeleted == false })
+    }
+    
     func insertOnServer() throws {
         DataStore.shared.events.writeChangeAndInsertOnServer(instance: self)
         for tournament in self.tournaments {
diff --git a/PadelClubData/Data/GroupStage.swift b/PadelClubData/Data/GroupStage.swift
index 67f7d18..a067168 100644
--- a/PadelClubData/Data/GroupStage.swift
+++ b/PadelClubData/Data/GroupStage.swift
@@ -166,7 +166,7 @@ final public class GroupStage: BaseGroupStage, SideStorable {
         let order = _matchOrder()
         let matchCount = max(1, matchCount)
         let count = ordered.count / matchCount
-        if ordered.isEmpty == false && ordered.count % order.count == 0 {
+        if ordered.isEmpty == false && order.isEmpty == false && ordered.count % order.count == 0 {
             let repeatedArray = (0..<count).flatMap { i in
                 order.map { $0 + i * order.count }
             }