diff --git a/addons/project/models/project.py b/addons/project/models/project.py
index 6b4478af4f3..a37fe9528e5 100644
--- a/addons/project/models/project.py
+++ b/addons/project/models/project.py
@@ -1499,9 +1499,13 @@ class Task(models.Model):
         if not self._check_recursion():
             raise ValidationError(_('Error! You cannot create a recursive hierarchy of tasks.'))
 
+    def _get_attachments_search_domain(self):
+        self.ensure_one()
+        return [('res_id', '=', self.id), ('res_model', '=', 'project.task')]
+
     def _compute_attachment_ids(self):
         for task in self:
-            attachment_ids = self.env['ir.attachment'].search([('res_id', '=', task.id), ('res_model', '=', 'project.task')]).ids
+            attachment_ids = self.env['ir.attachment'].search(task._get_attachments_search_domain()).ids
             message_attachment_ids = task.mapped('message_ids.attachment_ids').ids  # from mail_thread
             task.attachment_ids = [(6, 0, list(set(attachment_ids) - set(message_attachment_ids)))]
 
diff --git a/addons/project/views/res_config_settings_views.xml b/addons/project/views/res_config_settings_views.xml
index 0bdd6a5d89f..02c842d86df 100644
--- a/addons/project/views/res_config_settings_views.xml
+++ b/addons/project/views/res_config_settings_views.xml
@@ -96,7 +96,7 @@
                                 </div>
                             </div>
                         </div>
-                        <h2>Analytics</h2>
+                        <h2 name="section_analytics">Analytics</h2>
                         <div class="row mt16 o_settings_container" name="analytic">
                             <div class="col-12 col-lg-6 o_setting_box">
                                 <div class="o_setting_left_pane">