diff --git a/src/Controller/ReportController.php b/src/Controller/ReportController.php
index 340f167d..18c6471f 100644
--- a/src/Controller/ReportController.php
+++ b/src/Controller/ReportController.php
@@ -1260,7 +1260,8 @@ class ReportController extends Controller
         foreach ($wr_data as $wr_entry)
         {
             $valid = $wr_filter->isValidRaffleEntry($wr_entry);
-            $filtered_data[] = $wr_entry;
+            if ($valid)
+                $filtered_data[] = $wr_entry;
         }
 
         $resp = new StreamedResponse();
diff --git a/src/Service/WarrantyRaffleFilter.php b/src/Service/WarrantyRaffleFilter.php
index d9edbb9e..ac76d5d2 100644
--- a/src/Service/WarrantyRaffleFilter.php
+++ b/src/Service/WarrantyRaffleFilter.php
@@ -2,12 +2,35 @@
 
 namespace App\Service;
 
+use App\Ramcar\WarrantyClass;
+
 class WarrantyRaffleFilter
 {
     public function isValidRaffleEntry($entry)
     {
         // entry is an associative array
-        // error_log('entry ' . $entry['first_name']);
+        // Serial Number of Battery (NOT blank)
+        if (empty($entry['serial']))
+            return false;
+
+        // Plate Number (NOT blank)
+        if (empty($entry['plate_number']))
+            return false;
+
+        // Warranty Class (ONLY private)
+        if ($entry['warranty_class'] != WarrantyClass::WTY_PRIVATE)
+            return false;
+
+        // either contact number of mobile number is present
+        if ((empty($entry['contact_number'])) &&
+            (empty($entry['mobile_number'])))
+            return false;
+
+        // First Name & Last Name have to be present
+        if ((empty($entry['first_name'])) || 
+            (empty($entry['last_name'])))
+            return false;
+
         return true;
     }
 }