diff --git a/custom_ui/fixtures/task.json b/custom_ui/fixtures/task.json
new file mode 100644
index 0000000..608a779
--- /dev/null
+++ b/custom_ui/fixtures/task.json
@@ -0,0 +1,354 @@
+[
+ {
+  "act_end_date": null,
+  "act_start_date": null,
+  "actual_time": 0.0,
+  "closing_date": null,
+  "color": null,
+  "company": "Sprinklers Northwest",
+  "completed_by": null,
+  "completed_on": null,
+  "custom_foreman": "HR-EMP-00014",
+  "custom_property": null,
+  "department": null,
+  "depends_on": [],
+  "depends_on_tasks": "",
+  "description": null,
+  "docstatus": 0,
+  "doctype": "Task",
+  "duration": 0,
+  "exp_end_date": null,
+  "exp_start_date": null,
+  "expected_time": 0.0,
+  "is_group": 0,
+  "is_milestone": 0,
+  "is_template": 1,
+  "issue": null,
+  "modified": "2025-05-13 06:34:23.580282",
+  "name": "TASK-2025-00007",
+  "old_parent": "",
+  "parent_task": null,
+  "priority": "Low",
+  "progress": 0.0,
+  "project": null,
+  "project_template": null,
+  "review_date": null,
+  "start": 0,
+  "status": "Template",
+  "subject": "15-Day QA",
+  "task_weight": 0.0,
+  "template_task": null,
+  "total_billing_amount": 0.0,
+  "total_costing_amount": 0.0,
+  "total_expense_claim": 0.0,
+  "type": "QA"
+ },
+ {
+  "act_end_date": null,
+  "act_start_date": null,
+  "actual_time": 0.0,
+  "closing_date": null,
+  "color": null,
+  "company": "Sprinklers Northwest",
+  "completed_by": null,
+  "completed_on": null,
+  "custom_foreman": null,
+  "custom_property": null,
+  "department": null,
+  "depends_on": [],
+  "depends_on_tasks": "",
+  "description": null,
+  "docstatus": 0,
+  "doctype": "Task",
+  "duration": 0,
+  "exp_end_date": null,
+  "exp_start_date": null,
+  "expected_time": 0.0,
+  "is_group": 0,
+  "is_milestone": 0,
+  "is_template": 1,
+  "issue": null,
+  "modified": "2025-05-08 12:46:33.245387",
+  "name": "TASK-2025-00008",
+  "old_parent": "",
+  "parent_task": null,
+  "priority": "Low",
+  "progress": 0.0,
+  "project": null,
+  "project_template": null,
+  "review_date": null,
+  "start": 0,
+  "status": "Template",
+  "subject": "Permit Close-out",
+  "task_weight": 0.0,
+  "template_task": null,
+  "total_billing_amount": 0.0,
+  "total_costing_amount": 0.0,
+  "total_expense_claim": 0.0,
+  "type": "Admin"
+ },
+ {
+  "act_end_date": null,
+  "act_start_date": null,
+  "actual_time": 0.0,
+  "closing_date": null,
+  "color": null,
+  "company": "Sprinklers Northwest",
+  "completed_by": null,
+  "completed_on": null,
+  "custom_foreman": null,
+  "custom_property": null,
+  "department": null,
+  "depends_on": [],
+  "depends_on_tasks": "",
+  "description": null,
+  "docstatus": 0,
+  "doctype": "Task",
+  "duration": 0,
+  "exp_end_date": null,
+  "exp_start_date": null,
+  "expected_time": 0.0,
+  "is_group": 0,
+  "is_milestone": 0,
+  "is_template": 1,
+  "issue": null,
+  "modified": "2025-05-08 13:04:15.934399",
+  "name": "TASK-2025-00001",
+  "old_parent": "",
+  "parent_task": null,
+  "priority": "Low",
+  "progress": 0.0,
+  "project": null,
+  "project_template": null,
+  "review_date": null,
+  "start": 0,
+  "status": "Template",
+  "subject": "Send customer 3-5 day window for start date",
+  "task_weight": 0.0,
+  "template_task": null,
+  "total_billing_amount": 0.0,
+  "total_costing_amount": 0.0,
+  "total_expense_claim": 0.0,
+  "type": "Admin"
+ },
+ {
+  "act_end_date": null,
+  "act_start_date": null,
+  "actual_time": 0.0,
+  "closing_date": null,
+  "color": null,
+  "company": "Sprinklers Northwest",
+  "completed_by": null,
+  "completed_on": null,
+  "custom_foreman": null,
+  "custom_property": null,
+  "department": null,
+  "depends_on": [],
+  "depends_on_tasks": "",
+  "description": null,
+  "docstatus": 0,
+  "doctype": "Task",
+  "duration": 0,
+  "exp_end_date": null,
+  "exp_start_date": null,
+  "expected_time": 0.0,
+  "is_group": 0,
+  "is_milestone": 0,
+  "is_template": 1,
+  "issue": null,
+  "modified": "2025-04-24 14:57:03.402721",
+  "name": "TASK-2025-00002",
+  "old_parent": "",
+  "parent_task": null,
+  "priority": "Low",
+  "progress": 0.0,
+  "project": null,
+  "project_template": null,
+  "review_date": null,
+  "start": 0,
+  "status": "Template",
+  "subject": "811/Locate call in",
+  "task_weight": 0.0,
+  "template_task": null,
+  "total_billing_amount": 0.0,
+  "total_costing_amount": 0.0,
+  "total_expense_claim": 0.0,
+  "type": "Admin"
+ },
+ {
+  "act_end_date": null,
+  "act_start_date": null,
+  "actual_time": 0.0,
+  "closing_date": null,
+  "color": null,
+  "company": "Sprinklers Northwest",
+  "completed_by": null,
+  "completed_on": null,
+  "custom_foreman": null,
+  "custom_property": null,
+  "department": null,
+  "depends_on": [],
+  "depends_on_tasks": "",
+  "description": null,
+  "docstatus": 0,
+  "doctype": "Task",
+  "duration": 0,
+  "exp_end_date": null,
+  "exp_start_date": null,
+  "expected_time": 0.0,
+  "is_group": 0,
+  "is_milestone": 0,
+  "is_template": 1,
+  "issue": null,
+  "modified": "2025-04-24 14:57:10.789639",
+  "name": "TASK-2025-00003",
+  "old_parent": "",
+  "parent_task": null,
+  "priority": "Low",
+  "progress": 0.0,
+  "project": null,
+  "project_template": null,
+  "review_date": null,
+  "start": 0,
+  "status": "Template",
+  "subject": "Permit(s) call in and pay",
+  "task_weight": 0.0,
+  "template_task": null,
+  "total_billing_amount": 0.0,
+  "total_costing_amount": 0.0,
+  "total_expense_claim": 0.0,
+  "type": "Admin"
+ },
+ {
+  "act_end_date": null,
+  "act_start_date": null,
+  "actual_time": 0.0,
+  "closing_date": null,
+  "color": null,
+  "company": "Sprinklers Northwest",
+  "completed_by": null,
+  "completed_on": null,
+  "custom_foreman": null,
+  "custom_property": null,
+  "department": null,
+  "depends_on": [],
+  "depends_on_tasks": "",
+  "description": null,
+  "docstatus": 0,
+  "doctype": "Task",
+  "duration": 0,
+  "exp_end_date": null,
+  "exp_start_date": null,
+  "expected_time": 0.0,
+  "is_group": 0,
+  "is_milestone": 0,
+  "is_template": 1,
+  "issue": null,
+  "modified": "2025-05-10 05:06:24.653035",
+  "name": "TASK-2025-00004",
+  "old_parent": "",
+  "parent_task": null,
+  "priority": "Low",
+  "progress": 0.0,
+  "project": null,
+  "project_template": null,
+  "review_date": null,
+  "start": 0,
+  "status": "Template",
+  "subject": "Primary Job",
+  "task_weight": 0.0,
+  "template_task": null,
+  "total_billing_amount": 0.0,
+  "total_costing_amount": 0.0,
+  "total_expense_claim": 0.0,
+  "type": "Labor"
+ },
+ {
+  "act_end_date": null,
+  "act_start_date": null,
+  "actual_time": 0.0,
+  "closing_date": null,
+  "color": null,
+  "company": "Sprinklers Northwest",
+  "completed_by": null,
+  "completed_on": null,
+  "custom_foreman": null,
+  "custom_property": null,
+  "department": null,
+  "depends_on": [],
+  "depends_on_tasks": "",
+  "description": null,
+  "docstatus": 0,
+  "doctype": "Task",
+  "duration": 0,
+  "exp_end_date": null,
+  "exp_start_date": null,
+  "expected_time": 0.0,
+  "is_group": 0,
+  "is_milestone": 0,
+  "is_template": 1,
+  "issue": null,
+  "modified": "2025-05-10 05:06:44.365741",
+  "name": "TASK-2025-00006",
+  "old_parent": "",
+  "parent_task": null,
+  "priority": "Low",
+  "progress": 0.0,
+  "project": null,
+  "project_template": null,
+  "review_date": null,
+  "start": 0,
+  "status": "Template",
+  "subject": "Curbing",
+  "task_weight": 0.0,
+  "template_task": null,
+  "total_billing_amount": 0.0,
+  "total_costing_amount": 0.0,
+  "total_expense_claim": 0.0,
+  "type": "Labor"
+ },
+ {
+  "act_end_date": null,
+  "act_start_date": null,
+  "actual_time": 0.0,
+  "closing_date": null,
+  "color": null,
+  "company": "Sprinklers Northwest",
+  "completed_by": null,
+  "completed_on": null,
+  "custom_foreman": null,
+  "custom_property": null,
+  "department": null,
+  "depends_on": [],
+  "depends_on_tasks": "",
+  "description": null,
+  "docstatus": 0,
+  "doctype": "Task",
+  "duration": 0,
+  "exp_end_date": null,
+  "exp_start_date": null,
+  "expected_time": 0.0,
+  "is_group": 0,
+  "is_milestone": 0,
+  "is_template": 1,
+  "issue": null,
+  "modified": "2025-05-10 05:06:35.232465",
+  "name": "TASK-2025-00005",
+  "old_parent": "",
+  "parent_task": null,
+  "priority": "Low",
+  "progress": 0.0,
+  "project": null,
+  "project_template": null,
+  "review_date": null,
+  "start": 0,
+  "status": "Template",
+  "subject": "Hydroseeding",
+  "task_weight": 0.0,
+  "template_task": null,
+  "total_billing_amount": 0.0,
+  "total_costing_amount": 0.0,
+  "total_expense_claim": 0.0,
+  "type": "Labor"
+ }
+]
\ No newline at end of file
diff --git a/custom_ui/hooks.py b/custom_ui/hooks.py
index c171720..c8a17c0 100644
--- a/custom_ui/hooks.py
+++ b/custom_ui/hooks.py
@@ -208,28 +208,25 @@ doc_events = {
 }
 
 fixtures = [
+    {
+        "dt": "Custom Field",
+        "filters": [["module", "in", ["Custom UI"]]]
+    },
     {
         "dt": "Email Template",
         "filters": [
             ["name", "in", ["Customer Invoice"]]
         ]
     },
+    {
+        "dt": "Task",
+        "filters": [["status", "=", "Template"]]
+    },
     {
         "dt": "Project Template"
     },
-    # These don't have reliable flags → export all
-    {
-        "dt": "Custom Field",
-        #"filters": ["name", "in", ["Address-custom_subdivision"]],
-        "filters": [["module", "in", ["Custom UI"]]]
-     },
-    # {"dt": "Property Setter"},
     {"dt": "Client Script"},
     {"dt": "Server Script"},
-    # {"dt": "Report"},
-    # {"dt": "Print Format"},
-    # {"dt": "Dashboard"},
-    # {"dt": "Workspace"},
 ]