diff --git a/app/Http/Controllers/FlightImportController.php b/app/Http/Controllers/FlightImportController.php
index 76dfda4..493d8fa 100644
--- a/app/Http/Controllers/FlightImportController.php
+++ b/app/Http/Controllers/FlightImportController.php
@@ -83,7 +83,7 @@ class FlightImportController extends Controller
             ->get(['id', 'name', 'municipality', 'iata_code', 'icao_code', 'region_id'])
             ->map(fn($a) => [
                 'value' => $a->id,
-                'title' => "{$a->name} ({$a->iata_code}/{$a->icao_code})",
+                'title' => "{$a->municipality} / {$a->name} ({$a->iata_code}/{$a->icao_code})",
                 'country_code' => strtolower($a?->region->country->code ?? ''),
             ])
             ->values()
@@ -129,7 +129,7 @@ class FlightImportController extends Controller
     {
         $user = Auth::user();
 
-        $flightToReconcile = ImportedFlight::where('user_id', $user->id)->orderBy('id')->first();
+        $flightToReconcile = ImportedFlight::where('user_id', $user->id)->orderBy('date', 'asc')->first();
 
         if (!$flightToReconcile) {
             return null;
diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index af04fb3..64b0f5f 100644
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -66,7 +66,7 @@ class SearchController extends Controller
             ->get(['id', 'name', 'municipality', 'iata_code', 'icao_code', 'region_id'])
             ->map(fn($a) => [
                 'value'        => $a->id,
-                'title'        => "{$a->name} ({$a->iata_code}/{$a->icao_code})",
+                'title'        => "{$a->municipality} / {$a->name} ({$a->iata_code}/{$a->icao_code})",
                 'country_code' => strtolower($a->region->country->code),
             ])
             ->values();
diff --git a/app/Models/Airline.php b/app/Models/Airline.php
index 99e5b05..eaefebe 100644
--- a/app/Models/Airline.php
+++ b/app/Models/Airline.php
@@ -14,8 +14,7 @@ class Airline extends Model
         'ICAO_code',
         'name',
         'internal_name',
-        'country_code',
-        'country_name',
+        'country_id',
         'active',
         'logo',
     ];
diff --git a/routes/web.php b/routes/web.php
index f81002d..284ee1d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -34,6 +34,10 @@ Route::domain(config('app.domain'))->group(
             Route::get('/reconcile', function () {
                 $flight = new FlightImportController()->reconcile(request());
 
+                if (!$flight) {
+                    return to_route('import.fr24');
+                }
+
                 return Inertia::render('ReconcileFlight', [
                     'flight' => $flight,
                     'key' => $flight['imported_flight_id'],