diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index ef96970be6626a76972dd628edc4a123dc278418..3fc04e23645984cc93347807db686ad5a724f35b 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -218,17 +218,15 @@ public class CouchDBDao implements IDatabaseDao {
 		try {
 			if (session.getCreator().equals(user.getUsername())) {
 				view = new View("skill_question/by_session_sorted_by_subject_and_text");
-				view.setStartKey("[" + URLEncoder.encode("\"" + session.get_id() + "\"", "UTF-8") + "]");
-				view.setEndKey("[" + URLEncoder.encode("\"" + session.get_id() + "\",{}", "UTF-8") + "]");
-
 			} else {
 				if (user.getType().equals(User.THM)) {
-					view = new View("skill_question/by_session_for_thm");
+					view = new View("skill_question/by_session_for_thm_full");
 				} else {
-					view = new View("skill_question/by_session_for_all");
+					view = new View("skill_question/by_session_for_all_full");
 				}
-				view.setKey(URLEncoder.encode("\"" + session.get_id() + "\"", "UTF-8"));
 			}
+			view.setStartKey("[" + URLEncoder.encode("\"" + session.get_id() + "\"", "UTF-8") + "]");
+			view.setEndKey("[" + URLEncoder.encode("\"" + session.get_id() + "\",{}", "UTF-8") + "]");
 
 			ViewResults questions = this.getDatabase().view(view);
 			if (questions == null || questions.isEmpty()) {
@@ -968,10 +966,10 @@ public class CouchDBDao implements IDatabaseDao {
 				"[" + URLEncoder.encode("\"" + user.getUsername() + "\",\"" + s.get_id() + "\"", "UTF-8") + "]"
 			);
 			ViewResults results = this.getDatabase().view(view);
+			List<Answer> answers = new ArrayList<Answer>();
 			if (results.getResults().isEmpty()) {
-				throw new NotFoundException();
+				return answers;
 			}
-			List<Answer> answers = new ArrayList<Answer>();
 			for (Document d : results.getResults()) {
 				Answer a = (Answer) JSONObject.toBean(d.getJSONObject().getJSONObject("value"), Answer.class);
 				a.set_id(d.getId());