diff --git a/maintenance_equipment_charge/__manifest__.py b/maintenance_equipment_charge/__manifest__.py
index e862db98..a397db71 100644
--- a/maintenance_equipment_charge/__manifest__.py
+++ b/maintenance_equipment_charge/__manifest__.py
@@ -1,6 +1,6 @@
 {
     'name': 'Equipment Charges',
-    'version': '11.0.1.0.0',
+    'version': '12.0.1.0.0',
     'author': 'Hibou Corp. <hello@hibou.io>',
     'category': 'Human Resources',
     'summary': 'Record related equipment charges.',
diff --git a/maintenance_equipment_charge/models/maintenance.py b/maintenance_equipment_charge/models/maintenance.py
index 8ca32e7c..278f8f50 100644
--- a/maintenance_equipment_charge/models/maintenance.py
+++ b/maintenance_equipment_charge/models/maintenance.py
@@ -5,7 +5,7 @@ class EquipmentChargeType(models.Model):
     _name = 'maintenance.equipment.charge.type'
 
     name = fields.Char(string='Charge Type')
-    uom_id = fields.Many2one('product.uom', string='Charge UOM')
+    uom_id = fields.Many2one('uom.uom', string='Charge UOM')
 
 
 class Equipment(models.Model):
@@ -42,5 +42,5 @@ class EquipmentCharge(models.Model):
     employee_id = fields.Many2one('hr.employee', string='Employee')
     department_id = fields.Many2one('hr.department', string='Department')
     qty = fields.Float(string='Quantity', default=1.0)
-    uom_id = fields.Many2one('product.uom', related='type_id.uom_id')
+    uom_id = fields.Many2one('uom.uom', related='type_id.uom_id')
     amount = fields.Float(string='Amount')
diff --git a/maintenance_equipment_charge/views/maintenance_views.xml b/maintenance_equipment_charge/views/maintenance_views.xml
index 00379d1c..43ce2b45 100644
--- a/maintenance_equipment_charge/views/maintenance_views.xml
+++ b/maintenance_equipment_charge/views/maintenance_views.xml
@@ -31,12 +31,11 @@
                 <field name="employee_id"/>
                 <field name="department_id"/>
                 <field name="type_id"/>
-                <separator/>
-                <group  expand='0' string='Group by...'>
-                    <filter string='Charge Type' domain="[]" context="{'group_by': 'type_id'}"/>
-                    <filter string='Equipment' domain="[]" context="{'group_by': 'equipment_id'}"/>
-                    <filter string='Employee' domain="[]" context="{'group_by': 'employee_id'}"/>
-                    <filter string='Department' domain="[]" context="{'group_by': 'department_id'}"/>
+                <group expand="0" string="Group By">
+                    <filter string="Charge Type" name="groupby_type_id" domain="[]" context="{'group_by':'type_id'}"/>
+                    <filter string='Equipment' name="groupby_equipment_id" domain="[]" context="{'group_by': 'equipment_id'}"/>
+                    <filter string='Employee' name="groupby_employee_id" domain="[]" context="{'group_by': 'employee_id'}"/>
+                    <filter string='Department' name="groupby_department_id" domain="[]" context="{'group_by': 'department_id'}"/>
                 </group>
             </search>
         </field>