diff --git a/bemade_fsm/__manifest__.py b/bemade_fsm/__manifest__.py
index a5a487a..c71d220 100644
--- a/bemade_fsm/__manifest__.py
+++ b/bemade_fsm/__manifest__.py
@@ -20,7 +20,7 @@
 ########################################################################################
 {
     'name': 'Improved Field Service Management',
-    'version': '15.0.1.0.2',
+    'version': '15.0.1.0.3',
     'summary': 'Adds functionality necessary for managing field service operations at Durpro.',
     'description': 'Adds functionality necessary for managing field service operations at Durpro.',
     'category': 'Services/Field Service',
diff --git a/bemade_fsm/views/task_views.xml b/bemade_fsm/views/task_views.xml
index 669ecc6..1fbfecf 100644
--- a/bemade_fsm/views/task_views.xml
+++ b/bemade_fsm/views/task_views.xml
@@ -50,72 +50,36 @@
         </record>
         <!-- Add parent_id = false to domain for My Tasks, All Tasks: To Schedule, All Tasks and To Invoice-->
         <record id="industry_fsm.project_task_action_fsm" model="ir.actions.act_window">
-            <field name="domain">[('is_fsm', '=', True),
-                                  ('display_project_id', '!=', False),
-                                  ('parent_id', '=', False)]
-            </field>
+            <field name="context">{'search_default_is_parent_task': True}</field>
         </record>
         <record id="industry_fsm.project_task_action_fsm_map"
                 model="ir.actions.act_window">
-            <field name="domain">[('is_fsm', '=', True),
-                                  ('display_project_id', '!=', False),
-                                  ('parent_id', '=', False)]
-            </field>
+            <field name="context">{'search_default_is_parent_task': True}</field>
         </record>
         <record id="industry_fsm.project_task_action_to_schedule_fsm"
                 model="ir.actions.act_window">
-            <field name="domain">[('is_fsm', '=', True),
-                                  ('display_project_id', '!=', False),
-                                  ('parent_id', '=', False)]
-            </field>
+            <field name="context">{'search_default_is_parent_task': True}</field>
         </record>
         <record id="industry_fsm.project_task_action_all_fsm"
                 model="ir.actions.act_window">
-            <field name="domain">[('is_fsm', '=', True),
-                                  ('display_project_id', '!=', False),
-                                  ('parent_id', '=', False)]
-            </field>
+            <field name="context">{'search_default_is_parent_task': True}</field>
         </record>
         <record id="industry_fsm_sale.project_task_action_to_invoice_fsm"
                 model="ir.actions.act_window">
-            <field name="domain">[('is_fsm', '=', True),
-                                  ('display_project_id', '!=', False),
-                                  ('parent_id', '=', False)]
-            </field>
+            <field name="context">{'search_default_is_parent_task': True}</field>
         </record>
-        <!-- Add parent_id = false to domain for planning actions as well -->
         <record id="industry_fsm.project_task_action_fsm_planning_groupby_user"
                 model="ir.actions.act_window">
-            <field name="domain">[('is_fsm', '=', True),
-                                  ('display_project_id', '!=', False),
-                                  ('parent_id', '=', False)]
-            </field>
+            <field name="context">{'search_default_is_parent_task': True}</field>
         </record>
         <record id="industry_fsm.project_task_action_fsm_planning_groupby_project"
                 model="ir.actions.act_window">
-            <field name="domain">[('is_fsm', '=', True),
-                                  ('display_project_id', '!=', False),
-                                  ('parent_id', '=', False)]
-            </field>
+            <field name="context">{'search_default_is_parent_task': True}</field>
         </record>
         <record id="industry_fsm_report.project_task_action_fsm_planning_groupby_worksheet"
                 model="ir.actions.act_window">
-            <field name="domain">[('is_fsm', '=', True),
-                                  ('display_project_id', '!=', False),
-                                  ('parent_id', '=', False)]
-            </field>
+            <field name="context">{'search_default_is_parent_task': True}</field>
         </record>
-        <!--        <record id="project_task_view_calendar_fsm" model="ir.ui.view">-->
-        <!--            <field name="name">bemade_fsm.project_task_view_calendar_fsm</field>-->
-        <!--            <field name="inherit_id" ref="industry_fsm.project_task_view_calendar_fsm"/>-->
-        <!--            <field name="model">project.task</field>-->
-        <!--            <field name="arch" type="xml">-->
-        <!--                <field name="user_ids" position="attributes">-->
-        <!--                    <attribute name="filters">1</attribute>-->
-        <!--                    <attribute name="color">user_ids</attribute>-->
-        <!--                </field>-->
-        <!--            </field>-->
-        <!--        </record>-->
         <record id="project_task_view_calendar_fsm_no_worksheet" model="ir.ui.view">
             <field name="name">bemade_fsm.project_task_view_calendar_no_worksheet</field>
             <field name="inherit_id"
@@ -166,6 +130,11 @@
                         ]
                     </attribute>
                 </filter>
+                <filter name="my_tasks" position="after">
+                    <filter name="is_parent_task"
+                            string="Parent Task"
+                            domain="[('parent_id', '=', False)]"/>
+                </filter>
             </field>
         </record>
     </data>