diff --git a/src/Controller/SearchController.php b/src/Controller/SearchController.php
index 45a582cd..1d73c4d7 100644
--- a/src/Controller/SearchController.php
+++ b/src/Controller/SearchController.php
@@ -38,39 +38,7 @@ class SearchController extends BaseController
         $search_term = $req->query->get('search');
         $results = $search->search($search_term);
 
-        // process rows
-        $rows = [];
-        // get the legacy job order results
-        foreach($results['legacy_job_orders'] as $lrow)
-        {
-            $row['id'] = $lrow->getID();
-            $row['name'] = $lrow->getCustFirstName() . " " . $lrow->getCustLastName();
-            $row['plate_number'] = $lrow->getPlateNumber();
-
-            $rows[] = $row;
-        }
-        
-        // get the job order results
-        foreach($results['job_orders'] as $jrow)
-        {
-            $row['id'] = $jrow->getID();
-            $row['name'] = $jrow->getCustomer()->getFirstName() . " " . $jrow->getCustomer()->getLastName();
-            $row['plate_number'] = $jrow->getCustomerVehicle()->getPlateNumber();
-
-            $rows[] = $row;
-        }
-
-        // get the warranties results
-        foreach($results['warranties'] as $wrow)
-        {
-            $row['id'] = $wrow->getID();
-            $row['name'] = $wrow->getFirstName() . " " . $wrow->getLastName();
-            $row['plate_number'] = $wrow->getPlateNumber();
-    
-            $rows[] = $row;
-        }
-
-        $params['data'] = $rows;
+        $params['data'] = $results;
         return $this->render('search/results.html.twig', $params);
     }
 }
diff --git a/templates/search/results.html.twig b/templates/search/results.html.twig
index 4b03c86c..268bc9c6 100644
--- a/templates/search/results.html.twig
+++ b/templates/search/results.html.twig
@@ -38,12 +38,36 @@
                                                 </div>
                         <!--begin: Datatable -->
                         <div id="data-rows">
+                            <p> Legacy Job Orders </p>
                             <table>
-                                {% for result in data %}
+                                {% for key, result in data.legacy_job_orders %}
                                     <tr>
-                                        <td> {{ result.id }}</td>
-                                        <td> {{ result.name }} </td>
-                                        <td> {{ result.plate_number }} </td>
+                                        <td> {{ result.getID() }} </td>
+                                        <td> {{ result.getCustLastName() }} </td>
+                                        <td> {{ result.getCustFirstName() }} </td>
+                                        <td> {{ result.getPlateNumber() }} </td>
+                                    </tr>
+                                {% endfor %}
+                            </table>
+                            <p> Job Orders </p>
+                            <table>
+                                {% for result in data.job_orders %}
+                                    <tr>
+                                        <td> {{ result.getID() }} </td>
+                                        <td> {{ result.getCustomer().getLastName() }} </td>
+                                        <td> {{ result.getCustomer().getFirstName() }}</td>
+                                        <td> {{ result.getCustomerVehicle().getPlateNumber() }}</td>
+                                    </tr>
+                                {% endfor %}
+                            </table>
+                            <p> Warranties </p>
+                            <table>
+                                {% for result in data.warranties %}
+                                    <tr>
+                                        <td> {{ result.getID() }} </td>
+                                        <td> {{ result.getLastName() }} </td>
+                                        <td> {{ result.getFirstName() }} </td>
+                                        <td> {{ result.getPlateNumber() }} </td>
                                     </tr>
                                 {% endfor %}
                             </table>