diff --git a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
index e3ca7e6e2bffba8e3d2419d2d0724b2f0deba579..0be4a5b80578a4ad192ed8f55715f6ecf9b3e511 100644
--- a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
+++ b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
@@ -431,12 +431,12 @@ public class LecturerQuestionController extends AbstractController {
 	@RequestMapping(value = "/setsubjectsort", method = RequestMethod.POST)
 	public void setSubjectSortOrder(
 			@RequestParam(required = true) final String sessionkey,
-            @RequestParam(required = true) final String sortType,
-            @RequestParam(required = true) final String isPreparation,
+            @RequestParam(required = true) final String sorttype,
+            @RequestParam(required = true) final String ispreparation,
 			@RequestBody String[] sortOrder
 			) {
 		try {
-			questionService.setSubjectSort(sessionkey, sortType, isPreparation, sortOrder) ;
+			questionService.setSort(sessionkey, "", sorttype, ispreparation, sortOrder) ;
 		} catch (final Exception e) {
 			throw new BadRequestException();
 		}
@@ -454,12 +454,12 @@ public class LecturerQuestionController extends AbstractController {
 	public void setQuestionSortOrder(
 			@RequestParam(required = true) final String sessionkey,
             @RequestParam(required = true) final String subject,
-            @RequestParam(required = true) final String sortType,
-            @RequestParam(required = true) final String isPreparation,
+            @RequestParam(required = true) final String sorttype,
+            @RequestParam(required = true) final String ispreparation,
 			@RequestBody String[] sortOrder
 			) {
 		try {
-			questionService.setQuestionSort(sessionkey, subject, sortType, isPreparation, sortOrder);
+			questionService.setSort(sessionkey, subject, sorttype, ispreparation, sortOrder);
 		} catch (final Exception e) {
 			throw new BadRequestException();
 		}
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 3350c198d7424f2d17b647ca04270795e57f8220..7ad3e3bf98cede52120800df91761f5ddd8ff81f 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -1951,10 +1951,10 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
     public SortOrder getSortOrder(String sessionId, String questionVariant, String subject) {
         String viewString = "";
         if ("preparation".equals(questionVariant)) {
-            viewString = "sort_order/preparation_question_sort_order_by_sessionId";    
+            viewString = "sort_order/preparation_question_sort_order_by_sessionid_and_subject";    
         }
         else if ("lecture".equals(questionVariant)) {
-            viewString = "sort_order/lecture_question_sort_order_by_sessionId";
+            viewString = "sort_order/lecture_question_sort_order_by_sessionid_and_subject";
         }
         
 		NovaView view = new NovaView(viewString);
diff --git a/src/main/java/de/thm/arsnova/services/IQuestionService.java b/src/main/java/de/thm/arsnova/services/IQuestionService.java
index 74c9c48fb9011f791dddb93ed5135c3d2dca6695..d697b5a2aa942686ec76d7f138eaef97fe28bdad 100644
--- a/src/main/java/de/thm/arsnova/services/IQuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/IQuestionService.java
@@ -138,11 +138,9 @@ public interface IQuestionService {
 
 	int getAbstentionAnswerCount(String questionId);
     
-    SortOrder setSubjectSort(String sessionkey, String sortType, String questionVariant, String[] sortOrder);
-    
     String getSubjectSortType(String sessionkey, String isPreparation);
     
-    SortOrder setQuestionSort(String sessionkey, String subject, String sortType, String questionVariant, String[] sortOrder);
+    SortOrder setSort(String sessionkey, String subject, String sortType, String questionVariant, String[] sortOrder);
     
     String getQuestionSortType(String sessionkey, String isPreparation, String subject);
 }
diff --git a/src/main/java/de/thm/arsnova/services/QuestionService.java b/src/main/java/de/thm/arsnova/services/QuestionService.java
index 77723fe678429b1cd68f1282ec071dfe32e34863..68c419af69d3f87059b253c4361983194faacf40 100644
--- a/src/main/java/de/thm/arsnova/services/QuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/QuestionService.java
@@ -111,7 +111,7 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
 	public Question saveQuestion(final Question question) {
 		final Session session = databaseDao.getSessionFromKeyword(question.getSessionKeyword());
 		question.setSessionId(session.get_id());
-        question.setTimestamp(long unixTime = System.currentTimeMillis() / 1000L);
+        question.setTimestamp(System.currentTimeMillis() / 1000L);
 
 		if ("freetext".equals(question.getQuestionType())) {
 			question.setPiRound(0);
@@ -787,23 +787,6 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
 		this.publisher = publisher;
 	}
     
-    @Override 
-    public SortOrder setSubjectSort(String sessionkey, String sortType, String questionVariant, String[] sortOrderList) {
-        Session session = databaseDao.getSessionFromKeyword(sessionkey);
-        SortOrder existing = databaseDao.getSortOrder(session.get_id(), questionVariant, "");
-        SortOrder sortOrder = new SortOrder();
-        if (existing != null) {
-            sortOrder.set_id(existing.get_id());
-            sortOrder.set_rev(existing.get_rev());
-        }
-        sortOrder.setSessionId(session.get_id());
-        sortOrder.setSubject("");
-        sortOrder.setSortType(sortType);
-        sortOrder.setQuestionVariant(questionVariant);
-        sortOrder.setSortOrder(Arrays.asList(sortOrderList));
-        return databaseDao.createOrUpdateSortOrder(sortOrder);
-    }
-    
     @Override
     public String getSubjectSortType(String sessionkey, String isPreparation) {
         SortOrder sortOrder = databaseDao.getSortOrder(sessionkey, isPreparation, "");
@@ -811,7 +794,7 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
     }
     
     @Override 
-    public SortOrder setQuestionSort(String sessionkey, String subject, String sortType, String questionVariant, String[] sortOrderList) {
+    public SortOrder setSort(String sessionkey, String subject, String sortType, String questionVariant, String[] sortOrderList) {
         Session session = databaseDao.getSessionFromKeyword(sessionkey);
         SortOrder existing = databaseDao.getSortOrder(session.get_id(), questionVariant, subject);
         SortOrder sortOrder = new SortOrder();