diff --git a/apps/registration/templates/search/indexes/registration/studentregistration_text.txt b/apps/registration/templates/search/indexes/registration/studentregistration_text.txt
index 1a19e6c..f103c7f 100644
--- a/apps/registration/templates/search/indexes/registration/studentregistration_text.txt
+++ b/apps/registration/templates/search/indexes/registration/studentregistration_text.txt
@@ -2,7 +2,7 @@
 {{ object.user.last_name }}
 {{ object.user.email }}
 {{ object.type }}
-{{ object.student_class }}
+{{ object.get_student_class_display }}
 {{ object.school }}
 {{ object.team.name }}
 {{ object.team.trigram }}
diff --git a/templates/search/search.html b/templates/search/search.html
index f798ff3..8e46546 100644
--- a/templates/search/search.html
+++ b/templates/search/search.html
@@ -1,6 +1,6 @@
 {% extends 'base.html' %}
 
-{% load crispy_forms_filters i18n %}
+{% load crispy_forms_filters highlight i18n %}
 
 {% block content %}
     <h2>{% trans "Search" %}</h2>
@@ -16,10 +16,14 @@
     <h3>{% trans "Results" %}</h3>
 
     <div id="search-results">
-        {% for result in page.object_list %}
-            <p>
-                <a href="{{ result.object.get_absolute_url }}">{{ result.object }}</a>
-            </p>
+        {% regroup page.object_list by model_name as categories %}
+        {% for category in categories %}
+            <h4>{% trans category.grouper|capfirst %}</h4>
+            {% for result in category.list %}
+                <p>
+                    <a href="{{ result.object.get_absolute_url }}">{{ result.object }}</a>
+                </p>
+            {% endfor %}
         {% empty %}
             <p>{% trans "No results found." %}</p>
         {% endfor %}