Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
===================================================================
diff -u -r8640cefdf8862cb87ca9847afbf05b1e388f5ff7 -r06766573847af75c683241ab63dd5f993e02fdbb
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	(.../QaAppConstants.java)	(revision 8640cefdf8862cb87ca9847afbf05b1e388f5ff7)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	(.../QaAppConstants.java)	(revision 06766573847af75c683241ab63dd5f993e02fdbb)
@@ -32,7 +32,6 @@
 	public static final String MY_SIGNATURE 							="laqa11";
 	public static final long   DEFAULT_CONTENT_ID 						=0;
     public static final long   DEFAULT_QUE_CONTENT_ID 					=1;
-	//public static final String TOOL_SERVICE								="tool_service";
 	public static final String ERROR_QAAPPLICATION 						= "error.exception.QaApplication";
 	public static final String TOOL_CONTENT_ID 							= "toolContentID";
 	public static final String MAP_QUESTION_CONTENT_KEY					= "mapQuestionContentKey";
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java
===================================================================
diff -u -rd14a9bdf360ad0cdc1ab569ada51505314aaa09d -r06766573847af75c683241ab63dd5f993e02fdbb
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java	(.../LearningUtil.java)	(revision d14a9bdf360ad0cdc1ab569ada51505314aaa09d)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java	(.../LearningUtil.java)	(revision 06766573847af75c683241ab63dd5f993e02fdbb)
@@ -117,7 +117,11 @@
     	    		 *  add the question to the questions Map in the displayOrder
     	    		 */
             		mapQuestions.put(new Integer(displayOrder).toString(),qaQueContent.getQuestion());
-            		mapFeedback.put(new Integer(displayOrder).toString(),qaQueContent.getFeedback());
+            		
+            		String feedback=qaQueContent.getFeedback();
+            		logger.debug("feedback: " + feedback);
+            		
+            		mapFeedback.put(new Integer(displayOrder).toString(), feedback.trim());
         		}
     		}
     	}
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r06766573847af75c683241ab63dd5f993e02fdbb
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 06766573847af75c683241ab63dd5f993e02fdbb)
@@ -107,18 +107,20 @@
 									
 
 				  			  		<c:forEach var="feedbackEntry" items="${generalLearnerFlowDTO.mapFeedback}">
-										<c:if test="${feedbackEntry.key == questionEntry.key}"> 						  			  		
-										  <tr>
-											<td colspan=2> <b> <bean:message key="label.feedback"/>:  </b>  
-										  	</td>
-										  </tr>
-										  
-										  <tr>
-											<td colspan=2> 
-												  <c:out value="${feedbackEntry.value}" escapeXml="false"/>						  																	
-										  	</td>
-										  </tr>
-									  	</c:if> 				    
+										<c:if test="${(feedbackEntry.value != '') && (feedbackEntry.value != null) }"> 						  			  		
+					  			  			<c:if test="${feedbackEntry.key == questionEntry.key}"> 						  			  		
+											  <tr>
+												<td colspan=2> <b> <bean:message key="label.feedback"/>:  </b>  
+											  	</td>
+											  </tr>
+											  
+											  <tr>
+												<td colspan=2> 
+													  <c:out value="${feedbackEntry.value}" escapeXml="false"/>						  																	
+											  	</td>
+											  </tr>
+										  	</c:if> 				    
+									  	</c:if> 				    										  	
 									</c:forEach>