Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
===================================================================
diff -u -re8a7110708b15579af2c6b31ac52a6da427fef6d -r0306bfaf661b3900cd5fdf901c2cfcb26493817e
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java	(.../AssessmentEscapeUtils.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java	(.../AssessmentEscapeUtils.java)	(revision 0306bfaf661b3900cd5fdf901c2cfcb26493817e)
@@ -296,9 +296,8 @@
 		}
 
 	    } else if (type == QbQuestion.TYPE_MATCHING_PAIRS) {
-
 		for (QbOption option : options) {
-		    sb.append("[" + option.getName() + ", ");
+		    sb.append("[" + option.getMatchingPair() + "-");
 
 		    for (AssessmentOptionAnswer optionAnswer : optionAnswers) {
 			if (option.getUid().equals(optionAnswer.getOptionUid())) {
@@ -317,7 +316,7 @@
 	    }
 
 	}
-	String ret = sb.toString().replaceAll("\\<.*?\\>", "");
+	String ret = sb.toString().replaceAll("\\<.*?\\>|\\r|\\n", "");
 
 	if (trimLastComma) {
 	    ret = ret.substring(0, ret.lastIndexOf(","));