diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index e7f5dcf4a1966305e892669718b37b43304467b9..763a2dacf2b862d752ea8a3762593aa7ac7c1e8e 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -205,7 +205,6 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
 
 	@Override
 	public List<Session> getPublicPoolSessions() {
-		// TODO replace with new view
 		final View view = new View("session/partial_by_ppsubject_name_for_publicpool");
 
 		final ViewResults sessions = getDatabase().view(view);
@@ -1847,7 +1846,7 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
 	public List<Question> getFlashcardsForTeachers(final Session session) {
 		final View view = new View("content/doc_by_sessionid_variant_active");
 		view.setStartKeyArray(session.get_id(), "flashcard");
-		view.setEndKeyArray(session.get_id(), "{}");
+		view.setEndKeyArray(session.get_id(), "flashcard", "{}");
 
 		return getQuestions(view, session);
 	}