diff --git a/addons_extensions/cwf_timesheet/views/timesheet_weekly_view.xml b/addons_extensions/cwf_timesheet/views/timesheet_weekly_view.xml
index 83642a474..91f224105 100644
--- a/addons_extensions/cwf_timesheet/views/timesheet_weekly_view.xml
+++ b/addons_extensions/cwf_timesheet/views/timesheet_weekly_view.xml
@@ -74,8 +74,9 @@
                 <filter string="Draft" name="filter_draft" domain="[('status','=','draft')]"/>
                 <filter string="Submitted" name="filter_submitted" domain="[('status','=','submit')]"/>
                 <group expand="0" string="Group By">
-                    <filter string="Week" name="week_id" domain="[]" context="{'group_by':'week_id'}"/>
-                    <filter string="Employee" name="employee_id" domain="[]" context="{'group_by':'employee_id'}"/>
+                    <filter string="Week" name="by_week_id" domain="[]" context="{'group_by':'week_id'}"/>
+                    <separator/>
+                    <filter string="Employee" name="by_employee_id" domain="[]" context="{'group_by':'employee_id'}"/>
                     <filter string="Status" name="state_type" domain="[]" context="{'group_by': 'status'}"/>
                 </group>
 
@@ -90,8 +91,8 @@
         <field name="view_mode">list,form</field>
         <field name="context">
             {
-                "search_default_week_id": 1,
-                "search_default_employee_id": 2
+                "search_default_by_week_id": 1,
+                "search_default_by_employee_id": 2
             }
         </field>
 
@@ -127,8 +128,9 @@
                 <field name="check_out_date"/>
                 <field name="state_type"/>
                 <group expand="0" string="Group By">
-                    <filter string="Employee" name="employee_id" domain="[]" context="{'group_by':'employee_id'}"/>
-                    <filter string="Week" name="week_id" domain="[]" context="{'group_by':'week_id'}"/>
+                    <filter string="Employee" name="by_employee_id" domain="[]" context="{'group_by':'employee_id'}"/>
+                    <separator/>
+                    <filter string="Week" name="by_week_id" domain="[]" context="{'group_by':'week_id'}"/>
                     <filter string="Status" name="state_type" domain="[]" context="{'group_by': 'state_type'}"/>
                 </group>
             </search>
@@ -140,7 +142,7 @@
         <field name="name">CWF Timesheet Lines</field>
         <field name="res_model">cwf.timesheet.line</field>
         <field name="view_mode">list</field>
-        <field name="context">{"search_default_week_id": 1, "search_default_employee_id": 1}</field>
+        <field name="context">{"search_default_by_week_id": 1, "search_default_by_employee_id": 1}</field>
         <field name="search_view_id" ref="cwf_timesheet.view_cwf_timesheet_line_search"/>
     </record>