diff --git a/app/Filament/Pages/Statistic.php b/app/Filament/Pages/Statistic.php
index e5eebfb6..f412ff14 100644
--- a/app/Filament/Pages/Statistic.php
+++ b/app/Filament/Pages/Statistic.php
@@ -25,7 +25,6 @@ use Filament\Schemas\Schema;
 use Filament\Support\RawJs;
 use Illuminate\Contracts\Support\Htmlable;
 use Illuminate\Support\HtmlString;
-use Livewire\Component;
 
 class Statistic extends BaseDashboard
 {
@@ -49,8 +48,8 @@ class Statistic extends BaseDashboard
         $filters = array_keys($this->filters);
         foreach($filters as $filter){
             switch($filter){
-                // exclude
                 case 'accuracy':
+                    $this->filters[$filter] = 0.125;
                 break;
                 case 'similar_past_matches':
                     $this->filters[$filter] = 'none';
diff --git a/app/Filament/Widgets/Data/LoadEvents.php b/app/Filament/Widgets/Data/LoadEvents.php
index 22042d18..15463e19 100644
--- a/app/Filament/Widgets/Data/LoadEvents.php
+++ b/app/Filament/Widgets/Data/LoadEvents.php
@@ -61,6 +61,8 @@ class LoadEvents
 
             $total_range = [$exp_total - $accuracy, $exp_total + $accuracy];
 
+            // dd($exp_handicap,$exp_total, $handicap_range, $total_range);
+
             $home_team = $match->home->ss_team_name;
             $away_team = $match->away->ss_team_name;
         } else {
@@ -73,8 +75,6 @@ class LoadEvents
          */
         $res = LoadEventsQuery::load($filter, $handicap_range, $total_range, $match);
 
-        // dd($res);
-
         $dataset_home = [];
         $dataset_away = [];
         $dataset_exp_home = [];
@@ -96,7 +96,6 @@ class LoadEvents
         $expectations = LoadExpectations::load($res['all'], $match, $statistic_type);
 
         if ($team_id) {
-
             foreach ($res[$team_position] as $value) {
 
                 $labels[] = round($value['starttime']->diffInDays(Carbon::now()));
@@ -243,15 +242,15 @@ class LoadEvents
                 if ($match->home_id == $value['home_id']) {
                     $dataset_home[] = (int) $value['val_home'];
                     $dataset_away[] = (int) $value['val_away'];
-                } elseif ($match->home_id == $value['away_id']) {
+                } else {
                     $dataset_home[] = (int) $value['val_away'];
                     $dataset_away[] = (int) $value['val_home'];
                 }
                 // Home playing AWAY done and commited
-                elseif ($match->away_id == $value['home_id']) {
+                if ($match->away_id == $value['home_id']) {
                     $dataset_home2[] = (int) $value['val_home'];
                     $dataset_away2[] = (int) $value['val_away'];
-                } elseif ($match->away_id == $value['away_id']) {
+                } else {
                     $dataset_home2[] = (int) $value['val_away'];
                     $dataset_away2[] = (int) $value['val_home'];
                 }