diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php
index 03216a17..09410a7e 100644
--- a/src/Controller/APIController.php
+++ b/src/Controller/APIController.php
@@ -383,7 +383,7 @@ class APIController extends Controller
             return $res->getReturnResponse();
 
         // get manufacturer list
-        $mfgs = $em->getRepository(VehicleManufacturer::class)->findBy([], ['name' => 'asc']);
+        $mfgs = $em->getRepository(VehicleManufacturer::class)->findBy(['flag_mobile' => true], ['name' => 'asc']);
         $mfg_list = [];
         foreach ($mfgs as $mfg)
         {
@@ -420,7 +420,14 @@ class APIController extends Controller
         }
 
         // get makes
-        $vehicles = $mfg->getVehicles();
+        $vehicles = $em->getRepository(Vehicle::class)->findBy(
+            [
+                'flag_mobile' => true,
+                'manufacturer' => $mfg_id,
+            ],
+            ['make' => 'asc']
+        );
+        // $vehicles = $mfg->getVehicles();
         $vlist = [];
         foreach ($vehicles as $v)
         {