diff --git a/bemade_fsm/reports/worksheet_custom_report_templates.xml b/bemade_fsm/reports/worksheet_custom_report_templates.xml
index dabf58f..7323cf6 100644
--- a/bemade_fsm/reports/worksheet_custom_report_templates.xml
+++ b/bemade_fsm/reports/worksheet_custom_report_templates.xml
@@ -248,7 +248,7 @@
                                         </td>
                                         <td t-out="task.description or ''"/>
                                     </tr>
-                                    <tr class="mt-0 pt-0">
+                                    <tr t-if="task.child_ids" class="mt-0 pt-0">
                                         <td/>
                                         <td>
                                             <t t-call="bemade_fsm.subtask_list"/>
diff --git a/bemade_fsm/views/task_views.xml b/bemade_fsm/views/task_views.xml
index 27a323e..fde605a 100644
--- a/bemade_fsm/views/task_views.xml
+++ b/bemade_fsm/views/task_views.xml
@@ -146,7 +146,8 @@
             <field name="domain">[('is_fsm', '=', True),
                                   ('project_id', '!=', False),
                                   ('display_in_project', '=', True),
-                                  ('parent_id', '=', False)]
+                                  ('parent_id', '=', False),
+                                  ('invoice_status', '=', 'to invoice')]
             </field>
         </record>
         <!-- Add parent_id = false to domain for planning actions as well -->