diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php
index 581d6152..fef7a111 100644
--- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php
+++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php
@@ -25,7 +25,7 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping
      */
     public function query()
     {
-        return Transaction::query();
+        return Transaction::whereIn([TransactionType::PAYMENT, TransactionType::BILL]);
     }
 
     /**
@@ -62,26 +62,11 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping
 
 
         $booking = $transaction->owner;
-        $company = '';
         if(!($booking instanceof Booking)){
-            $booking = $transaction->owner->owner;
-
-            if($booking instanceof Transaction){
-                $booking = $booking->owner;
-            }
-
-            if($booking instanceof Company){
-                $company = $booking;
-                $booking = null;
-            } else {
-                $company = $booking->company;
-            }
-
-        } else {
-            $company = $booking->company;
+            $booking = $booking->owner;
         }
 
-        if((!($company instanceof Company) || !($booking instanceof Booking)) && $booking !== null ) dd($company, $booking);
+        $company = $booking->company;
 
         return [
             $company->reference,