diff --git a/src/Controller/ScanController.php b/src/Controller/ScanController.php
index 903a7d01..1b339e9d 100644
--- a/src/Controller/ScanController.php
+++ b/src/Controller/ScanController.php
@@ -311,7 +311,7 @@ class ScanController extends AbstractController
         $input = trim($request->request->getString('input', ''));
 
         // We cannot use getEnum here, because we get an empty string for mode, when auto mode is selected
-        $mode  = $request->request->getString('mode', BarcodeSourceType::class, '');
+        $mode  = $request->request->getString('mode', '');
         if ($mode === '') {
             $modeEnum = null;
         } else {
diff --git a/src/Repository/PartRepository.php b/src/Repository/PartRepository.php
index 03d6a8cc..49342301 100644
--- a/src/Repository/PartRepository.php
+++ b/src/Repository/PartRepository.php
@@ -433,16 +433,16 @@ class PartRepository extends NamedDBElementRepository
         $qb->select('part');
 
         if ($caseInsensitive) {
-            $qb->where("LOWER(part.mpn) = LOWER(:mpn)");
+            $qb->where("LOWER(part.manufacturer_product_number) = LOWER(:mpn)");
         } else {
-            $qb->where("part.mpn = :mpn");
+            $qb->where("part.manufacturer_product_number = :mpn");
         }
 
         if ($manufacturerName !== null) {
             $qb->leftJoin('part.manufacturer', 'manufacturer');
 
             if ($caseInsensitive) {
-                $qb->andWhere("LOWER(part.manufacturer.name) = LOWER(:manufacturerName)");
+                $qb->andWhere("LOWER(manufacturer.name) = LOWER(:manufacturerName)");
             } else {
                 $qb->andWhere("manufacturer.name = :manufacturerName");
             }