diff --git a/src/contents/ui/MainPage.qml b/src/contents/ui/MainPage.qml
index 97dcbc69f0bda40c97da7138859287bce80c28ed..e4af1bc61db464480786310d00db7d850f12ab66 100644
--- a/src/contents/ui/MainPage.qml
+++ b/src/contents/ui/MainPage.qml
@@ -119,6 +119,7 @@ Kirigami.PageRoute {
                                 iconName: "edit-delete"
                                 onTriggered: {
                                     vehicleModel.removeVehicle(index);
+                                    router.navigateToRoute(["main"]);
                                 }
                             }
                         ]
diff --git a/src/contents/ui/ServiceRecords.qml b/src/contents/ui/ServiceRecords.qml
index a99446493752f55f000eb187d306023edac2bcec..267661f01c9fe1408a6675e5f16c7d9d19f37b7f 100644
--- a/src/contents/ui/ServiceRecords.qml
+++ b/src/contents/ui/ServiceRecords.qml
@@ -10,7 +10,7 @@ Kirigami.PageRoute {
         Kirigami.ScrollablePage {
             property var vehicleId: Kirigami.PageRouter.data.id
             Component.onCompleted: {
-                recordModel.changeVehicleFilter(vehcileId);
+                recordModel.changeVehicleFilter(vehicleId);
                 //Check vehicle warnings
                 dbAnalytics.checkOilChangeNeededForVehicle(vehicleId, appAnalyticsSettings.value("milesForOilChange",5000), appAnalyticsSettings.value("monthsForOilChange",6));
             }
@@ -49,8 +49,10 @@ Kirigami.PageRoute {
                                 text: qsTr("You are due for an oil change!")
                                 Connections {
                                     target: dbAnalytics
-                                    function onIsOilChangeNeeded(changeNeeded) {
-                                        oilMessage.visible = changeNeeded;
+                                    function onIsOilChangeNeeded(changeNeeded, vehicle) {
+                                        if(vehicle == vehicleId) {
+                                            oilMessage.visible = changeNeeded;
+                                        }
                                     }
                                 }
                             }
diff --git a/src/db/recordanalytics.cpp b/src/db/recordanalytics.cpp
index e01544f2d99aeea4ca8bb2028d8c853be769484a..bc520f9fdfad46136062fa19ec196e46250d756a 100644
--- a/src/db/recordanalytics.cpp
+++ b/src/db/recordanalytics.cpp
@@ -1,5 +1,4 @@
 /*
- * <one line to give the program's name and a brief idea of what it does.>
  * Copyright (C) 2020  <Kevin Whitakerr> <eyecreate@eyecreate.org>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -47,9 +46,9 @@ void RecordAnalytics::checkOilChangeNeededForVehicle(int vehicleId, int milesFor
             }
         }
         if(lastKnownMiles-lastOilMiles > milesForChange || lastOilMiles == 0 || !lastOilDate.isValid() || lastOilDate.daysTo(QDateTime::currentDateTime()) > 30*monthsForChange) {
-            emit this->isOilChangeNeeded(true);
+            emit this->isOilChangeNeeded(true, vehicleId);
         } else {
-            emit this->isOilChangeNeeded(false);
+            emit this->isOilChangeNeeded(false, vehicleId);
         }
     });
 }
diff --git a/src/db/recordanalytics.h b/src/db/recordanalytics.h
index 50da00e8656164f06441b4611fe4ce6679a440dc..074942293d5d9498f38c2471ac7ad11c66f513be 100644
--- a/src/db/recordanalytics.h
+++ b/src/db/recordanalytics.h
@@ -1,5 +1,4 @@
 /*
- * <one line to give the program's name and a brief idea of what it does.>
  * Copyright (C) 2020  <Kevin Whitaker> <eyecreate@eyecreate.org>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -34,7 +33,7 @@ public:
     Q_INVOKABLE void checkOilChangeNeededForVehicle(int vehicleId, int milesForChange=5000, int monthsForChange=6);
     
 signals:
-    void isOilChangeNeeded(bool changeNeeded);
+    void isOilChangeNeeded(bool changeNeeded, int vehicleId);
     
 private:
     QSqlDatabase _db;