Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/OpenDiscussions.java
===================================================================
--- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/OpenDiscussions.java	(revision d97a36e1661150c0c19e045e88c3d906813a8f99)
+++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/OpenDiscussions.java	(revision ab17a5ce79578fcbe5240f29bb333bebf3623425)
@@ -43,4 +43,5 @@
 import dblearnstar.webapp.annotations.AdministratorPage;
 import dblearnstar.webapp.annotations.StudentPage;
+import dblearnstar.webapp.services.EvaluationService;
 import dblearnstar.webapp.services.GenericService;
 import dblearnstar.webapp.services.PersonManager;
@@ -65,5 +66,9 @@
 	private TestManager testManager;
 	@Inject
-	private PersonManager pm;
+	private PersonManager personManager;
+	@Inject
+	private EvaluationService evaluationService;
+
+
 	@Inject
 	private AjaxResponseRenderer ajaxResponseRenderer;
@@ -88,11 +93,6 @@
 
 	public List<SolutionAssessment> getSolutionAssessmentsWithDiscussion() {
-		return ((List<SolutionAssessment>) UsefulMethods.castList(SolutionAssessment.class,
-				genericService.getAll(SolutionAssessment.class)))
-				.stream()
-				.filter(p -> p.getAssessmentDiscussions().size() > 0
-						&& p.getStudentSubmitSolution().getStudentStartedTest().getTestInstance()
-								.getTestInstanceId() == selectedTestInstance.getTestInstanceId())
-				.collect(Collectors.toList());
+		return evaluationService
+				.getSolutionAssessmentsWithDiscussionForTestInstance(selectedTestInstance.getTestInstanceId());
 	}
 
@@ -108,5 +108,5 @@
 			return tilist;
 		} else if (userInfo.isStudent()) {
-			long studentId = pm.getStudentsByPersonId(userInfo.getPersonId()).get(0).getStudentId();
+			long studentId = personManager.getStudentsByPersonId(userInfo.getPersonId()).get(0).getStudentId();
 			List<AssessmentDiscussion> listAD = UsefulMethods.castList(AssessmentDiscussion.class,
 					genericService.getAll(AssessmentDiscussion.class));
@@ -133,9 +133,8 @@
 	}
 
-	@Inject
-	private PersonManager personManager;
-
 	public boolean answered(AssessmentDiscussion ad) {
+		logger.debug("   ad = {} {}", ad.getAssessmentDiscussionId(), ad.getPerson().getUserName());
 		if (ad.getReplies() != null && ad.getReplies().size() > 0) {
+			logger.debug("      has replies");
 			boolean allAnswered = true;
 			for (AssessmentDiscussion i : ad.getReplies()) {
@@ -146,4 +145,5 @@
 			return allAnswered;
 		} else {
+			logger.info("      no replies");
 			return personManager.isInstructor(ad.getPerson());
 		}
@@ -152,4 +152,5 @@
 	public boolean isAnsweredByInstructor() {
 		boolean allAnswered = true;
+		logger.debug("sa = {}", runningSolutionAssessment.getSolutionAssessmentId());
 		for (AssessmentDiscussion ad : runningSolutionAssessment.getAssessmentDiscussions().stream()
 				.filter(p -> p.getReplyTo() == null).toList()) {
Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/EvaluationService.java
===================================================================
--- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/EvaluationService.java	(revision d97a36e1661150c0c19e045e88c3d906813a8f99)
+++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/EvaluationService.java	(revision ab17a5ce79578fcbe5240f29bb333bebf3623425)
@@ -25,4 +25,5 @@
 import java.util.List;
 
+import dblearnstar.model.entities.SolutionAssessment;
 import dblearnstar.model.entities.Student;
 import dblearnstar.model.entities.StudentSubmitSolution;
@@ -68,3 +69,5 @@
 			List<StudentSubmitSolution> submissions);
 
+	public List<SolutionAssessment> getSolutionAssessmentsWithDiscussionForTestInstance(long testInstanceId);
+
 }
Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/EvaluationServiceImpl.java
===================================================================
--- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/EvaluationServiceImpl.java	(revision d97a36e1661150c0c19e045e88c3d906813a8f99)
+++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/EvaluationServiceImpl.java	(revision ab17a5ce79578fcbe5240f29bb333bebf3623425)
@@ -45,4 +45,5 @@
 import org.slf4j.Logger;
 
+import dblearnstar.model.entities.SolutionAssessment;
 import dblearnstar.model.entities.Student;
 import dblearnstar.model.entities.StudentSubmitSolution;
@@ -903,3 +904,17 @@
 	}
 
+	@Override
+	public List<SolutionAssessment> getSolutionAssessmentsWithDiscussionForTestInstance(long testInstanceId) {
+		return UsefulMethods.castList(SolutionAssessment.class,
+				getEntityManager()
+						.createQuery(
+								"""
+										select distinct ad.solutionEvaluation
+										from AssessmentDiscussion ad
+										where ad.solutionEvaluation.studentSubmitSolution.studentStartedTest.testInstance.testInstanceId=:testInstanceId
+										order by ad.solutionEvaluation.evaluatedOn
+														""")
+						.setParameter("testInstanceId", testInstanceId).getResultList());
+	}
+
 }