diff --git a/scipost_django/colleges/templates/colleges/fellowship_detail.html b/scipost_django/colleges/templates/colleges/fellowship_detail.html
index b609656398631790a737e6eb633b37f181b820de..4694a11c629615e8137bb3024b7bd9e390aaa872 100644
--- a/scipost_django/colleges/templates/colleges/fellowship_detail.html
+++ b/scipost_django/colleges/templates/colleges/fellowship_detail.html
@@ -54,7 +54,15 @@
           </tr>
           <tr>
             <th>Type</th>
-            <td>{{ fellowship.guest|yesno:"Guest fellowship,Regular fellowship"|safe }}</td>
+            <td>
+	      {% if fellowship.guest %}
+	      	<span class="text-warning">Guest</span>
+	      {% elif fellowship.senior %}
+	      	<span class="text-success">Senior</span>
+	      {% else %}
+	      	<span class="text-primary">Regular</span>
+	      {% endif %}
+`	    </td>
           </tr>
         </tbody>
       </table>
@@ -87,7 +95,15 @@
           {% for fship in fellowship.sibling_fellowships %}
             <tr>
               <td>{{ fship.id }}</td>
-              <td>{{ fship.guest|yesno:"Guest fellowship,Regular fellowship"|safe }}</td>
+              <td>
+		{% if fship.guest %}
+		  <span class="text-warning">Guest</span>
+		{% elif fship.senior %}
+		  <span class="text-success">Senior</span>
+		{% else %}
+		  <span class="text-primary">Regular</span>
+		{% endif %}
+	      </td>
               <td>
                 {% if fship.start_date %}
                   from {{ fship.start_date }}
diff --git a/scipost_django/colleges/views.py b/scipost_django/colleges/views.py
index 1e78d148a5d7668819fd58885ccf1eeb10b5b222..6a1384db859d28f9ac3e088aee88982e81de31ba 100644
--- a/scipost_django/colleges/views.py
+++ b/scipost_django/colleges/views.py
@@ -201,6 +201,13 @@ class FellowshipDetailView(PermissionsMixin, DetailView):
     permission_required = "scipost.can_manage_college_composition"
     model = Fellowship
 
+    def get_queryset(self):
+        queryset = Fellowship.objects.all().prefetch_related(
+            "pool__preprint",
+            "pool__editor_in_charge",
+        )
+        return queryset
+
 
 class FellowshipListView(PermissionsMixin, PaginationMixin, ListView):
     """