diff --git a/app/Filament/Widgets/Data/LoadEvents.php b/app/Filament/Widgets/Data/LoadEvents.php
index b233e9d1..6c8898f2 100644
--- a/app/Filament/Widgets/Data/LoadEvents.php
+++ b/app/Filament/Widgets/Data/LoadEvents.php
@@ -171,7 +171,7 @@ class LoadEvents
 
             $results_per_event[] = $value['gls_h'] . ' : ' . $value['gls_a'];
 
-            if ($team_position == 'home') {
+            if ($similar_past_matches != 'none') {
                 switch ($value['result_code']) {
                     case '1':
                         $results['w']++;
@@ -185,7 +185,6 @@ class LoadEvents
                         $results['w2']++;
                         break;
                 }
-
                 switch ($statistic_type) {
                     case 'gls':
                         $val_home = (int) $value['gls_h'];
@@ -218,147 +217,198 @@ class LoadEvents
                         $val_away = (int) $value['tsh_a'];
                         break;
                 }
-            } elseif ($team_position == 'away') {
-
-                switch ($value['result_code']) {
-                    case '1':
-                        $results['l']++;
-                        $results['w2']++;
-                        break;
-                    case 'X':
-                        $results['d']++;
-                        break;
-                    case '2':
-                        $results['w']++;
-                        $results['l2']++;
-                        break;
-                }
-
-                switch ($statistic_type) {
-                    case 'gls':
-                        $val_home = (int) $value['gls_a'];
-                        $val_away = (int) $value['gls_h'];
-                        $dataset_exp_home[]  = (float) round($value['exp_away'], 1);
-                        $dataset_exp_away[]  = (float) round($value['exp_home'], 1);
-                        break;
-                    case 'crn':
-                        $val_home = (int) $value['crn_a'];
-                        $val_away = (int) $value['crn_h'];
-                        break;
-                    case 'fls':
-                        $val_home = (int) $value['fls_a'];
-                        $val_away = (int) $value['fls_h'];
-                        break;
-                    case 'ofs':
-                        $val_home = (int) $value['ofs_a'];
-                        $val_away = (int) $value['ofs_h'];
-                        break;
-                    case 'crd':
-                        $val_home = (int) $value['crd_a'];
-                        $val_away = (int) $value['crd_h'];
-                        break;
-                    case 'snt':
-                        $val_home = (int) $value['snt_a'];
-                        $val_away = (int) $value['snt_h'];
-                        break;
-                    case 'tsh':
-                        $val_home = (int) $value['tsh_a'];
-                        $val_away = (int) $value['tsh_h'];
-                        break;
-                }
             } else {
-                switch ($value['result_code']) {
-                    case '1':
-                        if ($team_id == $value['home_id']) {
-                            $results['l2']++;
-                            $results['w']++;
-                        } else {
-                            $results['w2']++;
-                            $results['l']++;
-                        }
-                        break;
-                    case 'X':
-                        $results['d']++;
-                        break;
-                    case '2':
-                        if ($team_id == $value['home_id']) {
-                            $results['l']++;
-                            $results['w2']++;
-                        } else {
-                            $results['l2']++;
-                            $results['w']++;
-                        }
-                        break;
-                }
 
-                switch ($statistic_type) {
-                    case 'gls':
-                        if ($team_id == $value['home_id']) {
+
+                if ($team_position == 'home') {
+                    switch ($value['result_code']) {
+                        case '1':
+                            $results['w']++;
+                            $results['l2']++;
+                            break;
+                        case 'X':
+                            $results['d']++;
+                            break;
+                        case '2':
+                            $results['l']++;
+                            $results['w2']++;
+                            break;
+                    }
+
+                    switch ($statistic_type) {
+                        case 'gls':
                             $val_home = (int) $value['gls_h'];
                             $val_away = (int) $value['gls_a'];
                             $dataset_exp_home[]  = (float) round($value['exp_home'], 1);
                             $dataset_exp_away[]  = (float) round($value['exp_away'], 1);
-                        } else {
+                            break;
+                        case 'crn':
+                            $val_home = (int) $value['crn_h'];
+                            $val_away = (int) $value['crn_a'];
+                            break;
+                        case 'fls':
+                            $val_home = (int) $value['fls_h'];
+                            $val_away = (int) $value['fls_a'];
+                            break;
+                        case 'ofs':
+                            $val_home = (int) $value['ofs_h'];
+                            $val_away = (int) $value['ofs_a'];
+                            break;
+                        case 'crd':
+                            $val_home = (int) $value['crd_h'];
+                            $val_away = (int) $value['crd_a'];
+                            break;
+                        case 'snt':
+                            $val_home = (int) $value['snt_h'];
+                            $val_away = (int) $value['snt_a'];
+                            break;
+                        case 'tsh':
+                            $val_home = (int) $value['tsh_h'];
+                            $val_away = (int) $value['tsh_a'];
+                            break;
+                    }
+                } elseif ($team_position == 'away') {
+
+                    switch ($value['result_code']) {
+                        case '1':
+                            $results['l']++;
+                            $results['w2']++;
+                            break;
+                        case 'X':
+                            $results['d']++;
+                            break;
+                        case '2':
+                            $results['w']++;
+                            $results['l2']++;
+                            break;
+                    }
+
+                    switch ($statistic_type) {
+                        case 'gls':
                             $val_home = (int) $value['gls_a'];
                             $val_away = (int) $value['gls_h'];
                             $dataset_exp_home[]  = (float) round($value['exp_away'], 1);
                             $dataset_exp_away[]  = (float) round($value['exp_home'], 1);
-                        }
-                        break;
-                    case 'crn':
-                        if ($team_id == $value['home_id']) {
-                            $val_home = (int) $value['crn_h'];
-                            $val_away = (int) $value['crn_a'];
-                        } else {
+                            break;
+                        case 'crn':
                             $val_home = (int) $value['crn_a'];
                             $val_away = (int) $value['crn_h'];
-                        }
-                        break;
-                    case 'fls':
-                        if ($team_id == $value['home_id']) {
-                            $val_home = (int) $value['fls_h'];
-                            $val_away = (int) $value['fls_a'];
-                        } else {
+                            break;
+                        case 'fls':
                             $val_home = (int) $value['fls_a'];
                             $val_away = (int) $value['fls_h'];
-                        }
-                        break;
-                    case 'ofs':
-                        if ($team_id == $value['home_id']) {
-                            $val_home = (int) $value['ofs_h'];
-                            $val_away = (int) $value['ofs_a'];
-                        } else {
+                            break;
+                        case 'ofs':
                             $val_home = (int) $value['ofs_a'];
                             $val_away = (int) $value['ofs_h'];
-                        }
-                        break;
-                    case 'crd':
-                        if ($team_id == $value['home_id']) {
-                            $val_home = (int) $value['crd_h'];
-                            $val_away = (int) $value['crd_a'];
-                        } else {
+                            break;
+                        case 'crd':
                             $val_home = (int) $value['crd_a'];
                             $val_away = (int) $value['crd_h'];
-                        }
-                        break;
-                    case 'snt':
-                        if ($team_id == $value['home_id']) {
-                            $val_home = (int) $value['snt_h'];
-                            $val_away = (int) $value['snt_a'];
-                        } else {
+                            break;
+                        case 'snt':
                             $val_home = (int) $value['snt_a'];
                             $val_away = (int) $value['snt_h'];
-                        }
-                        break;
-                    case 'tsh':
-                        if ($team_id == $value['home_id']) {
-                            $val_home = (int) $value['tsh_h'];
-                            $val_away = (int) $value['tsh_a'];
-                        } else {
+                            break;
+                        case 'tsh':
                             $val_home = (int) $value['tsh_a'];
                             $val_away = (int) $value['tsh_h'];
-                        }
-                        break;
+                            break;
+                    }
+                } else {
+                    switch ($value['result_code']) {
+                        case '1':
+                            if ($team_id == $value['home_id']) {
+                                $results['l2']++;
+                                $results['w']++;
+                            } else {
+                                $results['w2']++;
+                                $results['l']++;
+                            }
+                            break;
+                        case 'X':
+                            $results['d']++;
+                            break;
+                        case '2':
+                            if ($team_id == $value['home_id']) {
+                                $results['l']++;
+                                $results['w2']++;
+                            } else {
+                                $results['l2']++;
+                                $results['w']++;
+                            }
+                            break;
+                    }
+
+                    switch ($statistic_type) {
+                        case 'gls':
+                            if ($team_id == $value['home_id']) {
+                                $val_home = (int) $value['gls_h'];
+                                $val_away = (int) $value['gls_a'];
+                                $dataset_exp_home[]  = (float) round($value['exp_home'], 1);
+                                $dataset_exp_away[]  = (float) round($value['exp_away'], 1);
+                            } else {
+                                $val_home = (int) $value['gls_a'];
+                                $val_away = (int) $value['gls_h'];
+                                $dataset_exp_home[]  = (float) round($value['exp_away'], 1);
+                                $dataset_exp_away[]  = (float) round($value['exp_home'], 1);
+                            }
+                            break;
+                        case 'crn':
+                            if ($team_id == $value['home_id']) {
+                                $val_home = (int) $value['crn_h'];
+                                $val_away = (int) $value['crn_a'];
+                            } else {
+                                $val_home = (int) $value['crn_a'];
+                                $val_away = (int) $value['crn_h'];
+                            }
+                            break;
+                        case 'fls':
+                            if ($team_id == $value['home_id']) {
+                                $val_home = (int) $value['fls_h'];
+                                $val_away = (int) $value['fls_a'];
+                            } else {
+                                $val_home = (int) $value['fls_a'];
+                                $val_away = (int) $value['fls_h'];
+                            }
+                            break;
+                        case 'ofs':
+                            if ($team_id == $value['home_id']) {
+                                $val_home = (int) $value['ofs_h'];
+                                $val_away = (int) $value['ofs_a'];
+                            } else {
+                                $val_home = (int) $value['ofs_a'];
+                                $val_away = (int) $value['ofs_h'];
+                            }
+                            break;
+                        case 'crd':
+                            if ($team_id == $value['home_id']) {
+                                $val_home = (int) $value['crd_h'];
+                                $val_away = (int) $value['crd_a'];
+                            } else {
+                                $val_home = (int) $value['crd_a'];
+                                $val_away = (int) $value['crd_h'];
+                            }
+                            break;
+                        case 'snt':
+                            if ($team_id == $value['home_id']) {
+                                $val_home = (int) $value['snt_h'];
+                                $val_away = (int) $value['snt_a'];
+                            } else {
+                                $val_home = (int) $value['snt_a'];
+                                $val_away = (int) $value['snt_h'];
+                            }
+                            break;
+                        case 'tsh':
+                            if ($team_id == $value['home_id']) {
+                                $val_home = (int) $value['tsh_h'];
+                                $val_away = (int) $value['tsh_a'];
+                            } else {
+                                $val_home = (int) $value['tsh_a'];
+                                $val_away = (int) $value['tsh_h'];
+                            }
+                            break;
+                    }
                 }
             }
             if (isset($val_home) && isset($val_away)) {