diff --git a/fleet_vehicle_inspection/models/fleet_vehicle_inspection.py b/fleet_vehicle_inspection/models/fleet_vehicle_inspection.py
index 786452eda..5dc0e0a28 100644
--- a/fleet_vehicle_inspection/models/fleet_vehicle_inspection.py
+++ b/fleet_vehicle_inspection/models/fleet_vehicle_inspection.py
@@ -143,12 +143,13 @@ def button_confirm(self):
             raise ValidationError(
                 _("Only inspections in 'draft' or 'cancel' states can be confirmed")
             )
-        if self.amount:
-            if not self.service_type_id:
-                raise ValidationError(_("Must select service type"))
-            self.service_id = self.env["fleet.vehicle.log.services"].create(
-                self._prepare_fleet_vehicle_log_services_vals()
-            )
+        for rec in self:
+            if rec.amount:
+                if not rec.service_type_id:
+                    raise ValidationError(_("Must select service type"))
+                rec.service_id = self.env["fleet.vehicle.log.services"].create(
+                    rec._prepare_fleet_vehicle_log_services_vals()
+                )
         self.state = "confirmed"
         return True
 
diff --git a/fleet_vehicle_inspection/views/fleet_vehicle_inspection_views.xml b/fleet_vehicle_inspection/views/fleet_vehicle_inspection_views.xml
index e7af628e4..3e9050e10 100644
--- a/fleet_vehicle_inspection/views/fleet_vehicle_inspection_views.xml
+++ b/fleet_vehicle_inspection/views/fleet_vehicle_inspection_views.xml
@@ -122,13 +122,13 @@
                 />
                 <filter
                     string="Inspection Completed"
-                    name="result"
-                    domain="[('state','=','completed')]"
+                    name="confirmed"
+                    domain="[('state','=','confirmed')]"
                 />
                 <filter
                     string="Inspection Canceled"
-                    name="result"
-                    domain="[('result','=','cancel')]"
+                    name="cancel"
+                    domain="[('state','=','cancel')]"
                 />
                 <separator />
                 <filter
diff --git a/fleet_vehicle_inspection_template/views/fleet_vehicle_inspection_template.xml b/fleet_vehicle_inspection_template/views/fleet_vehicle_inspection_template.xml
index 4d1538da7..44e107667 100644
--- a/fleet_vehicle_inspection_template/views/fleet_vehicle_inspection_template.xml
+++ b/fleet_vehicle_inspection_template/views/fleet_vehicle_inspection_template.xml
@@ -39,11 +39,7 @@
                         </page>
                     </notebook>
                 </sheet>
-                <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers" />
-                    <field name="activity_ids" widget="mail_activity" />
-                    <field name="message_ids" widget="mail_thread" />
-                </div>
+                <chatter />
             </form>
         </field>
     </record>