diff --git a/app/Filament/Widgets/Data/LoadEvents.php b/app/Filament/Widgets/Data/LoadEvents.php
index 45d57a5c..ef672d98 100644
--- a/app/Filament/Widgets/Data/LoadEvents.php
+++ b/app/Filament/Widgets/Data/LoadEvents.php
@@ -545,8 +545,11 @@ class LoadEvents
                 // quindi la media di questi 120 dati)
 
                 foreach ($res as $value) {
-
-                    if ($team_id == $value['home_id'] or $team_id == $value['away_id']) {
+                    if (
+                        ($team_position == 'all' && ($team_id == $value['home_id'] or $team_id == $value['away_id'])) or
+                        ($team_position == 'home' && $team_id == $value['home_id']) or
+                        ($team_position == 'away' && $team_id == $value['away_id'])
+                    ) {
                         switch ($statistic_type) {
                             case 'gls':
                                 $media_team_h[] = (int) $value['gls_h'];
@@ -612,7 +615,11 @@ class LoadEvents
                 }
 
                 $average_team = 0;
+                $average_team_h = 0;
+                $average_team_a = 0;
                 $average_league = 0;
+                $average_league_h = 0;
+                $average_league_a = 0;
                 if ($team_id && $media_team_h){
                     $sum = array_sum($media_team_h) + array_sum($media_team_a);
                     $count = count($media_team_h) + count($media_team_a);
@@ -627,40 +634,35 @@ class LoadEvents
                     $average_league = $media_league ? round(array_sum($media_league) / \count($media_league), 2) : 0;
                 }
 
-
                 $data_team = array_fill(0, count($labels), $average_team);
                 $data_league = array_fill(0, count($labels), $average_league);
 
-                if ($average_team) {
-                    $data['datasets'][] = [
-                        'label' => 'Average Team',
-                        'events' => $events,
-                        'data' => $data_team,
-                        'tension' => 0.5,
-                        'borderColor' => '#ad46ff',
-                        'backgroundColor' => '#ad46ff',
-                        'borderDash' => [5, 5],
-                        'pointStyle' => false,
-                        'hidden' => false,
-                        'average_team_h' => $average_team_h,
-                        'average_team_a' => $average_team_a,
-                    ];
-                }
-                if ($average_league){
-                    $data['datasets'][] = [
-                        'label' => 'Average League',
-                        'events' => $events,
-                        'data' => $data_league,
-                        'tension' => 0.5,
-                        'borderColor' => '#00bba7',
-                        'backgroundColor' => '#00bba7',
-                        'borderDash' => [5, 5],
-                        'pointStyle' => false,
-                        'hidden' => false,
-                        'average_league_h' => $average_league_h,
-                        'average_league_a' => $average_league_a,
-                    ];
-                }
+                $data['datasets'][] = [
+                    'label' => 'Average Team',
+                    'events' => $events,
+                    'data' => $data_team,
+                    'tension' => 0.5,
+                    'borderColor' => '#ad46ff',
+                    'backgroundColor' => '#ad46ff',
+                    'borderDash' => [5, 5],
+                    'pointStyle' => false,
+                    'hidden' => false,
+                    'average_team_h' => $average_team_h,
+                    'average_team_a' => $average_team_a,
+                ];
+                $data['datasets'][] = [
+                    'label' => 'Average League',
+                    'events' => $events,
+                    'data' => $data_league,
+                    'tension' => 0.5,
+                    'borderColor' => '#00bba7',
+                    'backgroundColor' => '#00bba7',
+                    'borderDash' => [5, 5],
+                    'pointStyle' => false,
+                    'hidden' => false,
+                    'average_league_h' => $average_league_h,
+                    'average_league_a' => $average_league_a,
+                ];
                 // dd($data);
             }
         }
diff --git a/app/Filament/Widgets/StatsMedianAverage.php b/app/Filament/Widgets/StatsMedianAverage.php
index 22b88254..891134bc 100644
--- a/app/Filament/Widgets/StatsMedianAverage.php
+++ b/app/Filament/Widgets/StatsMedianAverage.php
@@ -88,6 +88,10 @@ class StatsMedianAverage extends StatsOverviewWidget
             $value_away = 0;
 
         $max_boxes = 4;
+        $average_team_h = 0;
+        $average_team_a = 0;
+        $average_league_h = 0;
+        $average_league_a = 0;
 
         foreach ($data['datasets'] as $value) {
             if ($value['label'] == "Average Team") {
@@ -105,12 +109,8 @@ class StatsMedianAverage extends StatsOverviewWidget
         $boxes = [];
         $boxes[] = Stat::make('Number', new HtmlString('<div id="number-of-events">' . $total_home . '</div>'))->description('Events')->extraAttributes(['x-init' => "animate('number-of-events', $total_home, 0)"]);
         $boxes[] = Stat::make('Average ' . $statistic_type, self::template('avhome', 'avaway', $home_team, $away_team))->description('Team ' . $team_position)->extraAttributes(['x-init' => "animate('avhome', $value_home); animate('avaway', $value_away)"]);
-        if(isset($average_team_h)){
-            $boxes[] = Stat::make('Average ' . $statistic_type, self::template('av_team_home', 'av_team_away', 'Home', 'Away', $average_team_h, $average_team_a))->description('Team Season')->extraAttributes(['x-init' => "animate('av_team_home', $average_team_h); animate('av_team_away', $average_team_a)"]);
-        }
-        if(isset($average_team_a)){
-            $boxes[] = Stat::make('Average ' . $statistic_type, self::template('av_league_home', 'av_league_away', 'Home', 'Away', $average_league_h, $average_league_a))->description('League Season')->extraAttributes(['x-init' => "animate('av_league_home', $average_league_h); animate('av_league_away', $average_league_a)"]);
-        }
+        $boxes[] = Stat::make('Average ' . $statistic_type, self::template('av_team_home', 'av_team_away', 'Home', 'Away', $average_team_h, $average_team_a))->description('Team Season')->extraAttributes(['x-init' => "animate('av_team_home', $average_team_h); animate('av_team_away', $average_team_a)"]);
+        $boxes[] = Stat::make('Average ' . $statistic_type, self::template('av_league_home', 'av_league_away', 'Home', 'Away', $average_league_h, $average_league_a))->description('League Season')->extraAttributes(['x-init' => "animate('av_league_home', $average_league_h); animate('av_league_away', $average_league_a)"]);
         $boxes[] = Stat::make('Median ' . $statistic_type, self::template('mehome', 'meaway', $home_team, $away_team, $median_home, $median_away))->description($team_position)->extraAttributes(['x-init' => "animate('mehome', $median_home); animate('meaway', $median_away, 0)"]);
         $boxes[] = Stat::make('Odds', self::templateOdds($data, $win, $draw, $lost))->description($team_position)->extraAttributes(['x-init' => "animate('mehome', $median_home); animate('meaway', $median_away, 0)"]);