diff --git a/src/Controller/VehicleController.php b/src/Controller/VehicleController.php
index afe45fc5..4cac6c27 100644
--- a/src/Controller/VehicleController.php
+++ b/src/Controller/VehicleController.php
@@ -70,11 +70,14 @@ class VehicleController extends Controller
 
         // build query
         $query = $qb->select('q')
-            ->addSelect('mfg.name as mfg_name');
+            ->addSelect('mfg.name as mfg_name')
+            ->addSelect('mfg.id as mfg_id');
 
         // add filters to query
         $this->setQueryFilters($datatable, $query);
 
+        error_log("test");
+
         // check if sorting is present, otherwise use default
         if (isset($datatable['sort']['field']) && !empty($datatable['sort']['field'])) {
             $prefix = '';
@@ -85,7 +88,8 @@ class VehicleController extends Controller
             $order = $datatable['sort']['sort'] ?? 'asc';
             $query->orderBy($prefix . $datatable['sort']['field'], $order);
         } else {
-            $query->orderBy('mfg_name', 'asc');
+            $query->orderBy('mfg_name', 'asc')
+                ->addOrderBy('q.make', 'asc');
         }
 
         // get rows for this page
@@ -100,6 +104,7 @@ class VehicleController extends Controller
             // add row data
             $row['id'] = $orow[0]->getID();
             $row['mfg_name'] = $orow['mfg_name'];
+            $row['mfg_id'] = $orow['mfg_id'];
             $row['make'] = $orow[0]->getMake();
             $row['model_year_from'] = $orow[0]->getModelYearFrom();
             $row['model_year_to'] = $orow[0]->getModelYearTo();
diff --git a/templates/vehicle/list.html.twig b/templates/vehicle/list.html.twig
index 36a3c580..35538fe2 100644
--- a/templates/vehicle/list.html.twig
+++ b/templates/vehicle/list.html.twig
@@ -33,7 +33,7 @@
 									</div>
 								</div>
 								<div class="col-xl-4 order-1 order-xl-2 m--align-right">
-									<button type="button" class="btn btn-success m-btn m-btn--custom m-btn--icon m-btn--air m-btn--pill mr-2" data-export-csv data-url="{{ url('vehicle_rows') }}" data-method="post" data-headers="ID,Name,Manufacturer" data-fields="id,make,mfg_name" data-filename="resq-vehicle-make-list-{{ 'now'|date('Y-m-d') }}">
+									<button type="button" class="btn btn-success m-btn m-btn--custom m-btn--icon m-btn--air m-btn--pill mr-2" data-export-csv data-url="{{ url('vehicle_rows') }}" data-method="post" data-headers="ID,Name,Manufacturer ID,Manufacturer,Model Year From,Model Year To" data-fields="id,make,mfg_id,mfg_name,model_year_from,model_year_to" data-filename="resq-vehicle-make-list-{{ 'now'|date('Y-m-d') }}">
 										<span>
 											<i class="fa fa-list"></i>
 											<span>Export Vehicle List</span>