diff --git a/app/Actions/Statistics/LoadEventsAspGoal.php b/app/Actions/Statistics/LoadEventsAspGoal.php
index e69a0216..c91f56d4 100644
--- a/app/Actions/Statistics/LoadEventsAspGoal.php
+++ b/app/Actions/Statistics/LoadEventsAspGoal.php
@@ -77,61 +77,31 @@ class LoadEventsAspGoal
         }
 
         /**
-         * STATTISTIC DATA
+         * STATISTIC DATA
          */
-        switch ($filter['team_position']) {
-            case 'home':
-                $res = StatistikoEvent::when($league_id, function ($query) use ($league_id) {
-                    return $query->where('league_id', $league_id);
-                })->when($team_id, function ($query) use ($team_id) {
+        $team_position = $filter['team_position'];
+
+        $res = StatistikoEvent::when($league_id, function ($query) use ($league_id) {
+            return $query->where('league_id', $league_id);
+        })->when($team_id, function ($query) use ($team_id, $team_position) {
+            switch ($team_position) {
+                case 'home':
                     return $query->where('home_id', $team_id);
-                })->when($handicap_range, function ($query) use ($handicap_range) {
-                    return $query->whereBetween('exp_handicap', $handicap_range);
-                })->when($total_range, function ($query) use ($total_range) {
-                    return $query->whereBetween('exp_total', $total_range);
-                })->when($start, function ($query) use ($start) {
-                    return $query->where('starttime', '>=', $start);
-                })->when($end, function ($query) use ($end) {
-                    return $query->where('starttime', '<=', $end);
-                })
-                    ->get();
-                break;
-
-            case 'away':
-                $res = StatistikoEvent::when($league_id, function ($query) use ($league_id) {
-                    return $query->where('league_id', $league_id);
-                })->when($team_id, function ($query) use ($team_id) {
+                case 'away':
                     return $query->where('away_id', $team_id);
-                })->when($handicap_range, function ($query) use ($handicap_range) {
-                    return $query->whereBetween('exp_handicap', $handicap_range);
-                })->when($total_range, function ($query) use ($total_range) {
-                    return $query->whereBetween('exp_total', $total_range);
-                })->when($start, function ($query) use ($start) {
-                    return $query->where('starttime', '>=', $start);
-                })->when($end, function ($query) use ($end) {
-                    return $query->where('starttime', '<=', $end);
-                })
-                    ->get();
-                break;
-
-            default:
-                $res = StatistikoEvent::when($league_id, function ($query) use ($league_id) {
-                    return $query->where('league_id', $league_id);
-                })->when($team_id, function ($query) use ($team_id) {
-                    $query->where('home_id', '=', $team_id)->orWhere('away_id', '=', $team_id);
-                })->when($handicap_range, function ($query) use ($handicap_range) {
-                    return $query->whereBetween('exp_handicap', $handicap_range);
-                })->when($total_range, function ($query) use ($total_range) {
-                    return $query->whereBetween('exp_total', $total_range);
-                })->when($start, function ($query) use ($start) {
-                    return $query->where('starttime', '>=', $start);
-                })->when($end, function ($query) use ($end) {
-                    return $query->where('starttime', '<=', $end);
-                })
-                    ->get();
-
-                break;
-        }
+                default:
+                    return $query->where('home_id', '=', $team_id)->orWhere('away_id', '=', $team_id);
+            }
+        })->when($handicap_range, function ($query) use ($handicap_range) {
+            return $query->whereBetween('exp_handicap', $handicap_range);
+        })->when($total_range, function ($query) use ($total_range) {
+            return $query->whereBetween('exp_total', $total_range);
+        })->when($start, function ($query) use ($start) {
+            return $query->where('starttime', '>=', $start);
+        })->when($end, function ($query) use ($end) {
+            return $query->where('starttime', '<=', $end);
+        })
+            ->get();
 
         $datasets = [];
         $labels = [];