Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -raaa2ae03ba47735754384f85804bcf13a71feae0 -r4c9365155a19f048af7f0465ced0b965141292d5
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision aaa2ae03ba47735754384f85804bcf13a71feae0)
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 4c9365155a19f048af7f0465ced0b965141292d5)
@@ -89,7 +89,7 @@
 						<strong><fmt:message key="label.question" /> <c:out
 								value="${questionEntry.key}" />:</strong>
 						<br>
-						<c:out value="${questionEntry.value}" escapeXml="false" />
+						<c:out value="${questionEntry.value.question}" escapeXml="false" />
 					</p>
 
 					<c:forEach var="answerEntry"
@@ -112,21 +112,12 @@
 					</c:forEach>
 
 
-					<c:forEach var="feedbackEntry"
-						items="${generalLearnerFlowDTO.mapFeedback}">
-						<c:if
-							test="${(feedbackEntry.value != '') && (feedbackEntry.value != null) }">
-							<c:if test="${feedbackEntry.key == questionEntry.key}">
+					<c:if test="${(questionEntry.value.feedback != '') && (questionEntry.value.feedback != null) }">
+							<span class="field-name"> <fmt:message
+									key="label.feedback" />: </span>
+							<c:out value="${questionEntry.value.feedback}" escapeXml="false" />
+					</c:if>
 
-								<span class="field-name"> <fmt:message
-										key="label.feedback" />: </span>
-
-								<c:out value="${feedbackEntry.value}" escapeXml="false" />
-
-							</c:if>
-						</c:if>
-					</c:forEach>
-
 				</div>
 
 			</c:forEach>