diff --git a/app/Http/Controllers/PagesController.php b/app/Http/Controllers/PagesController.php
index d0bbd1b..eb6530e 100644
--- a/app/Http/Controllers/PagesController.php
+++ b/app/Http/Controllers/PagesController.php
@@ -378,7 +378,10 @@ class PagesController extends Controller
     public function judgingentry(Request $judgingentry_req)
     {
         $judges = \App\Models\Judges::all();
-        $vehicles = \App\Models\Vehicles::all();
+        $vehicles = \App\Models\Vehicles::with('vehicleOwner')
+            ->join('bidders', 'vehicles.owner', '=', 'bidders.bidder_assigned_number')
+            ->orderByRaw('CAST(bidder_assigned_number AS UNSIGNED) ASC')
+            ->get();
         \Log::info("Judges count: " . $judges->count());
         \Log::info("Vehicles count: " . $vehicles->count());
 
diff --git a/resources/views/judgingentry.blade.php b/resources/views/judgingentry.blade.php
index 3d518c9..e7542b1 100644
--- a/resources/views/judgingentry.blade.php
+++ b/resources/views/judgingentry.blade.php
@@ -20,8 +20,7 @@
                             {{ csrf_field() }}
                             <div class="col-md-4">
                                 <label for="judge_id" class="form-label">Judge</label>
-                                <!-- Temporarily disabling TomSelect with data-no-tomselect -->
-                                <select name="judge_id" id="judge_id" class="form-select" data-no-tomselect="true" required>
+                                <select name="judge_id" id="judge_id" class="form-select" required>
                                     @foreach($judges as $judge)
                                         <option value="{{ $judge->idjudges }}">{{ $judge->judge_number }}</option>
                                     @endforeach
@@ -29,10 +28,10 @@
                             </div>
                             <div class="col-md-4">
                                 <label for="vehicle_id" class="form-label">Vehicle</label>
-                                <select name="vehicle_id" id="vehicle_id" class="form-select" data-no-tomselect="true" required>
+                                <select name="vehicle_id" id="vehicle_id" class="form-select" required>
                                     @foreach($vehicles as $vehicle)
                                         <option value="{{ $vehicle->idvehicles }}">
-                                            {{ $vehicle->vehicleOwner->bidder_assigned_number ?? '?' }} - {{ $vehicle->make }} {{ $vehicle->model }}
+                                            {{ $vehicle->bidder_assigned_number }} - {{ $vehicle->make }} {{ $vehicle->model }}
                                         </option>
                                     @endforeach
                                 </select>