diff --git a/scanpipe/templates/scanpipe/codebase_relation.html b/scanpipe/templates/scanpipe/codebase_relation.html
index 1951f18bc..efe6a300e 100644
--- a/scanpipe/templates/scanpipe/codebase_relation.html
+++ b/scanpipe/templates/scanpipe/codebase_relation.html
@@ -21,9 +21,9 @@
     <table class="table is-bordered is-narrow is-hoverable is-fullwidth">
       <thead>
         <tr>
-          <th>From resource</th>
+          <th style="width: 45%">From resource</th>
           <th>Match type</th>
-          <th>To resource</th>
+          <th style="width: 45%">To resource</th>
         </tr>
       </thead>
       <tbody>
@@ -32,7 +32,7 @@
             {% if not request.GET.missing_only %}
               <tr>
                 {% if forloop.first %}
-                  <td class="break-all" style="min-width: 200px;" rowspan="{{ resource.related_to.count }}">
+                  <td class="break-all" style="min-width: 200px;" rowspan="{{ resource.related_to.all|length }}">
                     <a class="modal-button is-black-link" data-target="file-content-modal" data-raw_url="{{ resource.get_raw_url }}" aria-haspopup="true">
                       <i class="far fa-file"></i>
                     </a>
@@ -90,7 +90,7 @@
             {% if not request.GET.missing_only %}
               <tr>
                 {% if forloop.first %}
-                  <td class="break-all" style="min-width: 200px;" rowspan="{{ resource.related_from.count }}">
+                  <td class="break-all" style="min-width: 200px;" rowspan="{{ resource.related_from.all|length }}">
                     <a class="modal-button is-black-link" data-target="file-content-modal" data-raw_url="{{ resource.get_raw_url }}" aria-haspopup="true">
                       <i class="far fa-file"></i>
                     </a>
diff --git a/scanpipe/views.py b/scanpipe/views.py
index fb05cbaff..84610630d 100644
--- a/scanpipe/views.py
+++ b/scanpipe/views.py
@@ -818,13 +818,18 @@ def get_context_data(self, **kwargs):
         project = self.object
         project_files = project.codebaseresources.files()
 
+        from_codebase_resources = project_files.from_codebase().prefetch_related(
+            "related_to__to_resource"
+        )
+        to_codebase_resources = project_files.to_codebase().prefetch_related(
+            "related_from__from_resource"
+        )
+
         context.update(
             {
                 "project": project,
-                "from_codebase_resources": project_files.from_codebase(),
-                "to_codebase_resources": project_files.to_codebase(),
-                # "missing_in_to": project_files.missing_in_to(),
-                # "missing_in_from": project_files.missing_in_from(),
+                "from_codebase_resources": from_codebase_resources,
+                "to_codebase_resources": to_codebase_resources,
             }
         )
         return context