diff --git a/app/server/models.py b/app/server/models.py
index 3b73dd5e..f1e05054 100644
--- a/app/server/models.py
+++ b/app/server/models.py
@@ -38,7 +38,7 @@ class Project(models.Model):
 
         return url
 
-    def get_template(self):
+    def get_template_name(self):
         if self.is_type_of(Project.DOCUMENT_CLASSIFICATION):
             template_name = 'annotation/document_classification.html'
         elif self.is_type_of(Project.SEQUENCE_LABELING):
diff --git a/app/server/templates/admin/dataset.html b/app/server/templates/admin/dataset.html
index 2fd197f6..95308253 100644
--- a/app/server/templates/admin/dataset.html
+++ b/app/server/templates/admin/dataset.html
@@ -19,7 +19,7 @@
                 </tr>
             </thead>
             <tbody>
-                {% for doc in documents %}
+                {% for doc in object_list %}
                 <tr>
                     <td>{{ forloop.counter }}</td>
                     <td>{{ doc.text|truncatechars:200 }}</td>
diff --git a/app/server/views.py b/app/server/views.py
index c0030c86..61dc9c3d 100644
--- a/app/server/views.py
+++ b/app/server/views.py
@@ -19,15 +19,10 @@ class IndexView(TemplateView):
 
 
 class ProjectView(LoginRequiredMixin, TemplateView):
-    template_name = 'annotation.html'
 
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        project_id = kwargs.get('project_id')
-        project = get_object_or_404(Project, pk=project_id)
-        self.template_name = project.get_template()
-
-        return context
+    def get_template_names(self):
+        project = get_object_or_404(Project, pk=self.kwargs['project_id'])
+        return [project.get_template_name()]
 
 
 class ProjectsView(LoginRequiredMixin, TemplateView):
@@ -50,12 +45,10 @@ class ProjectsView(LoginRequiredMixin, TemplateView):
 
 class DatasetView(SuperUserMixin, LoginRequiredMixin, ListView):
     template_name = 'admin/dataset.html'
-    context_object_name = 'documents'
     paginate_by = 5
 
     def get_queryset(self):
-        project_id = self.kwargs['project_id']
-        project = get_object_or_404(Project, pk=project_id)
+        project = get_object_or_404(Project, pk=self.kwargs['project_id'])
         return project.documents.all()