diff --git a/app/Controllers/AuthController.php b/app/Controllers/AuthController.php
index 6109bc1..0f74d5e 100644
--- a/app/Controllers/AuthController.php
+++ b/app/Controllers/AuthController.php
@@ -124,9 +124,10 @@ class AuthController extends ResourceController
 
         // Format date for FE
         $user = $this->userModel->select('user_id,first_name,last_name,role_id,org_id,group_id,last_login_at')->where('email', $data->email)->first();
-        $user['last_login_at'] = !empty($user['last_login_at'])
-            ? date('d, M-Y h:iA', strtotime($user['last_login_at']))
-            : null;
+        $user['last_login_at'] = empty($user['last_login_at'])
+            ? null
+            : date('d, M-Y h:iA', strtotime($user['last_login_at']));
+            
 
         
         //get service for the organization
diff --git a/app/Controllers/ReportsController.php b/app/Controllers/ReportsController.php
index 48f57e2..1ba86ed 100644
--- a/app/Controllers/ReportsController.php
+++ b/app/Controllers/ReportsController.php
@@ -43,10 +43,10 @@ class ReportsController extends BaseController
             }
 
             // Separate domestic
-            $domestic = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'domestic'));
+            $domestic = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'Domestic'));
 
             // Separate international
-            $international = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'international'));
+            $international = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'International'));
 
             if(isset($data['export']))
             {
@@ -108,10 +108,10 @@ class ReportsController extends BaseController
             }
 
             // Separate domestic
-            $domestic = array_values(array_filter($flat_result, fn($row) => $row['plan_trip_type'] === 'domestic'));
+            $domestic = array_values(array_filter($flat_result, fn($row) => $row['plan_trip_type'] === 'Domestic'));
 
             // Separate international
-            $international = array_values(array_filter($flat_result, fn($row) => $row['plan_trip_type'] === 'international'));
+            $international = array_values(array_filter($flat_result, fn($row) => $row['plan_trip_type'] === 'International'));
 
 
 
@@ -167,10 +167,10 @@ class ReportsController extends BaseController
             }
 
             // Separate domestic
-            $domestic = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'domestic'));
+            $domestic = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'Domestic'));
 
             // Separate international
-            $international = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'international'));
+            $international = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'International'));
 
             if(isset($data['export']))
             {
@@ -222,10 +222,10 @@ class ReportsController extends BaseController
             }
 
             // Separate domestic
-            $domestic = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'domestic'));
+            $domestic = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'Domestic'));
 
             // Separate international
-            $international = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'international'));
+            $international = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'International'));
 
 
             if(isset($data['export']))
@@ -324,10 +324,10 @@ class ReportsController extends BaseController
             }
 
             // Separate domestic
-            $domestic = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'domestic'));
+            $domestic = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'Domestic'));
 
             // Separate international
-            $international = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'international'));
+            $international = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'International'));
 
             if(isset($data['export']))
             {
diff --git a/app/Models/ReportsModel.php b/app/Models/ReportsModel.php
index 64c41d3..fea2dc9 100644
--- a/app/Models/ReportsModel.php
+++ b/app/Models/ReportsModel.php
@@ -21,8 +21,8 @@ class ReportsModel extends Model
                         m_plan.so_number,
                         m_cost_center.name AS cost_center,
                         CASE
-                            WHEN m_plan.trip_type = 1 THEN 'domestic'
-                            WHEN m_plan.trip_type = 2 THEN 'international' 
+                            WHEN m_plan.trip_type = 1 THEN 'Domestic'
+                            WHEN m_plan.trip_type = 2 THEN 'International' 
                             ELSE 'unknown'
                         END AS plan_trip_type,
                         al.Service,
@@ -124,8 +124,8 @@ class ReportsModel extends Model
                     '{$serviceAlias}' As 'Service',
                     COUNT(*) AS service_count,
                     CASE
-                        WHEN m_plan.trip_type = 1 THEN 'domestic'
-                        WHEN m_plan.trip_type = 2 THEN 'international'
+                        WHEN m_plan.trip_type = 1 THEN 'Domestic'
+                        WHEN m_plan.trip_type = 2 THEN 'International'
                         ELSE 'unknown'
                     END AS plan_trip_type
                 FROM
@@ -169,8 +169,8 @@ class ReportsModel extends Model
                         m_cost_center.name AS cost_center,
                         c_flight.trip_type AS flight_trip_type,
                         CASE
-                            WHEN m_plan.trip_type = 1 THEN 'domestic'
-                            WHEN m_plan.trip_type = 2 THEN 'international' 
+                            WHEN m_plan.trip_type = 1 THEN 'Domestic'
+                            WHEN m_plan.trip_type = 2 THEN 'International' 
                             ELSE 'unknown'
                         END AS plan_trip_type,
                         -- CONCAT_WS(' - ',
@@ -230,8 +230,8 @@ class ReportsModel extends Model
                         m_plan.so_number,
                         m_cost_center.name AS cost_center,
                         CASE
-                            WHEN m_plan.trip_type = 1 THEN 'domestic'
-                            WHEN m_plan.trip_type = 2 THEN 'international' 
+                            WHEN m_plan.trip_type = 1 THEN 'Domestic'
+                            WHEN m_plan.trip_type = 2 THEN 'International' 
                             ELSE 'unknown'
                         END AS plan_trip_type,
                         c_accomodation.hotel_name AS hotel_name,
@@ -331,8 +331,8 @@ class ReportsModel extends Model
                         m_cost_center.name AS cost_center,
                         c_flight.trip_type AS flight_trip_type,
                         CASE
-                            WHEN m_plan.trip_type = 1 THEN 'domestic'
-                            WHEN m_plan.trip_type = 2 THEN 'international' 
+                            WHEN m_plan.trip_type = 1 THEN 'Domestic'
+                            WHEN m_plan.trip_type = 2 THEN 'International' 
                             ELSE 'unknown'
                         END AS plan_trip_type,
                         CONCAT_WS(' - ',