QuestionService.java, SubjectService.java modified