Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
===================================================================
diff -u -ree5a38ed6690931ce9850baabe551ca8ae947a39 -r89eb8824370b9646254df13f34e4c1ad0ff330cb
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java	(.../McImportContentVersionFilter.java)	(revision ee5a38ed6690931ce9850baabe551ca8ae947a39)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java	(.../McImportContentVersionFilter.java)	(revision 89eb8824370b9646254df13f34e4c1ad0ff330cb)
@@ -104,11 +104,11 @@
 		// Question ID will be filled later as it requires QbService
 		XMLUtil.addTextElement(qbQuestion, "version", "1");
 		XMLUtil.addTextElement(qbQuestion, "createDate", createDate);
-		XMLUtil.rewriteTextElement(mcQuestion, qbQuestion, "mark", "maxMark", "1", true);
-		XMLUtil.rewriteTextElement(mcQuestion, qbQuestion, "feedback", "feedback", null, true,
+		XMLUtil.rewriteTextElement(mcQuestion, qbQuestion, "mark", "maxMark", "1", false, true);
+		XMLUtil.rewriteTextElement(mcQuestion, qbQuestion, "feedback", "feedback", null, false, true,
 			QbUtils.QB_MIGRATION_TRIMMER);
 		String description = XMLUtil.rewriteTextElement(mcQuestion, qbQuestion, "question", "description", null,
-			true, QbUtils.QB_MIGRATION_CKEDITOR_CLEANER);
+			false, true, QbUtils.QB_MIGRATION_CKEDITOR_CLEANER);
 		// get name out of description as there were no descriptions in MCQ before
 		if (description != null) {
 		    XMLUtil.addTextElement(qbQuestion, "name",
@@ -125,7 +125,7 @@
 		Element qbOptions = document.createElement("qbOptions");
 		qbQuestion.appendChild(qbOptions);
 		int maxDisplayOrder = 0;
-		for (int mcOptionIndex = 0; mcOptionIndex < mcQuestions.getLength(); mcOptionIndex++) {
+		for (int mcOptionIndex = 0; mcOptionIndex < mcOptions.getLength(); mcOptionIndex++) {
 		    Element mcOption = (Element) mcOptions.item(mcOptionIndex);
 		    Element qbOption = document.createElement("org.lamsfoundation.lams.qb.model.QbOption");
 		    qbOptions.appendChild(qbOption);
@@ -135,10 +135,11 @@
 			    .valueOf(XMLUtil.getChildElementValue(mcOption, "correctOption", "false"));
 		    XMLUtil.addTextElement(qbOption, "maxMark", correctOption ? "1" : "0");
 
-		    maxDisplayOrder = Math.max(Integer.valueOf(XMLUtil.rewriteTextElement(mcOption, qbOption,
-			    "displayOrder", "displayOrder", String.valueOf(maxDisplayOrder + 1), true)),
+		    maxDisplayOrder = Math.max(
+			    Integer.valueOf(XMLUtil.rewriteTextElement(mcOption, qbOption, "displayOrder",
+				    "displayOrder", String.valueOf(maxDisplayOrder + 1), false, true)),
 			    maxDisplayOrder);
-		    XMLUtil.rewriteTextElement(mcOption, qbOption, "mcQueOptionText", "name", null, true,
+		    XMLUtil.rewriteTextElement(mcOption, qbOption, "mcQueOptionText", "name", null, false, true,
 			    QbUtils.QB_MIGRATION_CKEDITOR_CLEANER);
 		}