diff --git a/src/pages/Route/Vehicle/VehicleList.vue b/src/pages/Route/Vehicle/VehicleList.vue
index 6fea52065..1011275b2 100644
--- a/src/pages/Route/Vehicle/VehicleList.vue
+++ b/src/pages/Route/Vehicle/VehicleList.vue
@@ -30,7 +30,7 @@ const columns = computed(() => [
     {
         name: 'companyFk',
         label: t('globals.company'),
-        format: (row, dashIfEmpty) => dashIfEmpty(row.company?.code),
+        format: (row, dashIfEmpty) => dashIfEmpty(row.company),
         columnFilter: {
             component: 'select',
             name: 'companyFk',
@@ -51,7 +51,7 @@ const columns = computed(() => [
     {
         name: 'warehouseFk',
         label: t('globals.warehouse'),
-        format: (row, dashIfEmpty) => dashIfEmpty(row.warehouse?.name),
+        format: (row, dashIfEmpty) => dashIfEmpty(row.warehouse),
         columnFilter: {
             component: 'select',
             name: 'warehouseFk',
@@ -86,9 +86,14 @@ const columns = computed(() => [
     {
         name: 'vehicleStateFk',
         label: t('globals.state'),
-        columnFilter: false,
+        columnFilter: {
+            component: 'select',
+            name: 'vehicleStateFk',
+            optionLabel: 'state',
+            options: vehicleStates.value,
+        },
         sortable: false,
-        format: (row, dashIfEmpty) => dashIfEmpty(row.event?.state?.state),
+        format: (row, dashIfEmpty) => dashIfEmpty(row.state),
     },
     {
         align: 'right',