diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
index 16e6bca1..8b599712 100644
--- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
@@ -401,22 +401,22 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
         }
 
         // get source of awareness if any
-        $soa_type = $req->request->get('source_of_awareness');
+        $soa_type = $req->request->get('source_of_awareness', '');
 
         // get remarks
         $remarks = $req->request->get('remarks', '');
 
         // get initial concern if any
-        $initial_concern = $req->request->get('initial_concern');
+        $initial_concern = $req->request->get('initial_concern', '');
 
         // get initial concern notes if any
         $initial_concern_notes = $req->request->get('initial_concern_notes', '');
 
         // get gender if any
-        $gender = $req->request->get('gender');
+        $gender = $req->request->get('gender', '');
 
         // get caller classification if any
-        $caller_class = $req->request->get('caller_class');
+        $caller_class = $req->request->get('caller_class','');
 
         // TODO: check status before saving since JO might already
         // have a status that needs to be retained
@@ -651,22 +651,22 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
         }
 
         // get source of awareness if any
-        $soa_type = $req->request->get('source_of_awareness');
+        $soa_type = $req->request->get('source_of_awareness', '');
 
         // get remarks
         $remarks = $req->request->get('remarks', '');
 
         // get initial concern if any
-        $initial_concern = $req->request->get('initial_concern');
+        $initial_concern = $req->request->get('initial_concern', '');
 
         // get initial concern notes if any
         $initial_concern_notes = $req->request->get('initial_concern_notes', '');
 
         // get gender if any
-        $gender = $req->request->get('gender');
+        $gender = $req->request->get('gender', '');
 
         // get caller classification if any
-        $caller_class = $req->request->get('caller_class');
+        $caller_class = $req->request->get('caller_class', '');
 
         if (empty($error_array)) 
         {
@@ -847,22 +847,22 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
         }
 
         // get source of awareness if any
-        $soa_type = $req->request->get('source_of_awareness');
+        $soa_type = $req->request->get('source_of_awareness', '');
 
         // get remarks
         $remarks = $req->request->get('remarks', '');
 
         // get initial concern if any
-        $initial_concern = $req->request->get('initial_concern');
+        $initial_concern = $req->request->get('initial_concern', '');
 
         // get initial concern notes if any
         $initial_concern_notes = $req->request->get('initial_concern_notes', '');
 
         // get gender if any
-        $gender = $req->request->get('gender');
+        $gender = $req->request->get('gender', '');
 
         // get caller classification if any
-        $caller_class = $req->request->get('caller_class');
+        $caller_class = $req->request->get('caller_class', '');
 
         if (empty($error_array))
         {
@@ -986,22 +986,22 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
         }
 
         // get source of awareness if any
-        $soa_type = $req->request->get('source_of_awareness');
+        $soa_type = $req->request->get('source_of_awareness', '');
 
         // get remarks
         $remarks = $req->request->get('remarks', '');
 
         // get initial concern if any
-        $initial_concern = $req->request->get('initial_concern');
+        $initial_concern = $req->request->get('initial_concern', '');
 
         // get initial concern notes if any
         $initial_concern_notes = $req->request->get('initial_concern_notes', '');
 
         // get gender if any
-        $gender = $req->request->get('gender');
+        $gender = $req->request->get('gender', '');
 
         // get caller classification if any
-        $caller_class = $req->request->get('caller_class');
+        $caller_class = $req->request->get('caller_class', '');
 
         // get current user
         $user = $this->security->getUser();
@@ -1116,22 +1116,22 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
         }
 
         // get source of awareness if any
-        $soa_type = $req->request->get('source_of_awareness');
+        $soa_type = $req->request->get('source_of_awareness', '');
 
         // get remarks
         $remarks = $req->request->get('remarks', '');
 
         // get initial concern if any
-        $initial_concern = $req->request->get('initial_concern');
+        $initial_concern = $req->request->get('initial_concern', '');
 
         // get initial concern notes if any
         $initial_concern_notes = $req->request->get('initial_concern_notes', '');
 
         // get gender if any
-        $gender = $req->request->get('gender');
+        $gender = $req->request->get('gender', '');
 
         // get caller classification if any
-        $caller_class = $req->request->get('caller_class');
+        $caller_class = $req->request->get('caller_class', '');
 
         if (empty($error_array)) {
             // coordinates
@@ -1360,22 +1360,22 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
         }
 
         // get source of awareness if any
-        $soa_type = $req->request->get('source_of_awareness');
+        $soa_type = $req->request->get('source_of_awareness', '');
 
         // get remarks
         $remarks = $req->request->get('remarks', '');
 
         // get initial concern if any
-        $initial_concern = $req->request->get('initial_concern');
+        $initial_concern = $req->request->get('initial_concern', '');
 
         // get initial concern notes if any
         $initial_concern_notes = $req->request->get('initial_concern_notes', '');
 
         // get gender if any
-        $gender = $req->request->get('gender');
+        $gender = $req->request->get('gender', '');
 
         // get caller classification if any
-        $caller_class = $req->request->get('caller_class');
+        $caller_class = $req->request->get('caller_class', '');
 
         // get previously assigned hub, if any
         $old_hub = $obj->getHub();
@@ -1614,22 +1614,22 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
         }
 
         // get source of awareness if any
-        $soa_type = $req->request->get('source_of_awareness');
+        $soa_type = $req->request->get('source_of_awareness', '');
 
         // get remarks
         $remarks = $req->request->get('remarks', '');
 
         // get initial concern if any
-        $initial_concern = $req->request->get('initial_concern');
+        $initial_concern = $req->request->get('initial_concern', '');
 
         // get initial concern notes if any
         $initial_concern_notes = $req->request->get('initial_concern_notes', '');
 
         // get gender if any
-        $gender = $req->request->get('gender');
+        $gender = $req->request->get('gender', '');
 
         // get caller classification if any
-        $caller_class = $req->request->get('caller_class');
+        $caller_class = $req->request->get('caller_class', '');
 
         if (empty($error_array)) {
             // rider mqtt event