diff --git a/initial_sql/sql_update_job_order_search_fields.sql b/initial_sql/sql_update_job_order_search_fields.sql
deleted file mode 100644
index 25eaffb6..00000000
--- a/initial_sql/sql_update_job_order_search_fields.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE job_order jo, customer c, customer_vehicle cv SET jo.first_name = c.first_name, jo.last_name = c.last_name, jo.phone_mobile = c.phone_mobile, jo.plate_number = cv.plate_number WHERE jo.customer_id = c.id AND jo.cvehicle_id = cv.id;
diff --git a/src/Entity/JobOrder.php b/src/Entity/JobOrder.php
index 203d9e3d..8bcdbb77 100644
--- a/src/Entity/JobOrder.php
+++ b/src/Entity/JobOrder.php
@@ -506,6 +506,12 @@ class JobOrder
     public function setCustomer(Customer $customer)
     {
         $this->customer = $customer;
+
+        // set the search fields for first name, last name, and mobile
+        $this->setFirstName($customer->getFirstName());
+        $this->setLastName($customer->getLastName());
+        $this->setPhoneMobile($customer->getPhoneMobile());
+
         return $this;
     }
 
@@ -517,6 +523,10 @@ class JobOrder
     public function setCustomerVehicle(CustomerVehicle $cus_vehicle)
     {
         $this->cus_vehicle = $cus_vehicle;
+
+        // set the search field for plate number
+        $this->setPlateNumber($cus_vehicle->getPlateNumber());
+
         return $this;
     }
 
diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
index 9b1ce8e1..e6cc6ec8 100644
--- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
@@ -343,11 +343,7 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
                 ->setORName($req->request->get('or_name'))
                 ->setPromoDetail($req->request->get('promo_detail'))
                 ->setModeOfPayment($req->request->get('mode_of_payment'))
-                ->setLandmark($req->request->get('landmark'))
-                ->setFirstName($cust_vehicle->getCustomer()->getFirstName())
-                ->setLastName($cust_vehicle->getCustomer()->getLastName())
-                ->setPhoneMobile($cust_vehicle->getCustomer()->getPhoneMobile())
-                ->setPlateNumber($cust_vehicle->getPlateNumber());
+                ->setLandmark($req->request->get('landmark'));
 
             // check if user is null, meaning call to create came from API
             if ($user != null)