Index: samigo-qti/src/java/org/sakaiproject/tool/assessment/qti/helper/ExtractionHelper.java
===================================================================
--- samigo-qti/src/java/org/sakaiproject/tool/assessment/qti/helper/ExtractionHelper.java	(revision 103170)
+++ samigo-qti/src/java/org/sakaiproject/tool/assessment/qti/helper/ExtractionHelper.java	(working copy)
@@ -506,7 +506,8 @@
     {
       feedback.setShowQuestionText(Boolean.TRUE);
     }
-    else
+    else if ("FALSE".equalsIgnoreCase(assessment.getAssessmentMetaDataByLabel(
+        "FEEDBACK_SHOW_QUESTION")))
     {
       feedback.setShowQuestionText(Boolean.FALSE);
     }
@@ -516,7 +517,8 @@
     {
       feedback.setShowStudentResponse(Boolean.TRUE);
     }
-    else
+    else if ("FALSE".equalsIgnoreCase(assessment.getAssessmentMetaDataByLabel(
+    "FEEDBACK_SHOW_RESPONSE")))
     {
       feedback.setShowStudentResponse(Boolean.FALSE);
     }
@@ -526,7 +528,8 @@
     {
       feedback.setShowCorrectResponse(Boolean.TRUE);
     }
-    else
+    else if ("FALSE".equalsIgnoreCase(assessment.getAssessmentMetaDataByLabel(
+    "FEEDBACK_SHOW_CORRECT_RESPONSE")))
     {
       feedback.setShowCorrectResponse(Boolean.FALSE);
     }
@@ -536,7 +539,8 @@
     {
       feedback.setShowStudentScore(Boolean.TRUE);
     }
-    else
+    else if ("FALSE".equalsIgnoreCase(assessment.getAssessmentMetaDataByLabel(
+    "FEEDBACK_SHOW_STUDENT_SCORE")))
     {
       feedback.setShowStudentScore(Boolean.FALSE);
     }
@@ -546,7 +550,8 @@
     {
       feedback.setShowStudentQuestionScore(Boolean.TRUE);
     }
-    else
+    else if ("FALSE".equalsIgnoreCase(assessment.getAssessmentMetaDataByLabel(
+    "FEEDBACK_SHOW_STUDENT_QUESTIONSCORE")))
     {
       feedback.setShowStudentQuestionScore(Boolean.FALSE);
     }
@@ -556,7 +561,8 @@
     {
       feedback.setShowQuestionLevelFeedback(Boolean.TRUE);
     }
-    else
+    else if ("FALSE".equalsIgnoreCase(assessment.getAssessmentMetaDataByLabel(
+    "FEEDBACK_SHOW_ITEM_LEVEL")))
     {
       feedback.setShowQuestionLevelFeedback(Boolean.FALSE);
     }
@@ -566,7 +572,8 @@
     {
       feedback.setShowSelectionLevelFeedback(Boolean.TRUE);
     }
-    else
+    else if ("FALSE".equalsIgnoreCase(assessment.getAssessmentMetaDataByLabel(
+    "FEEDBACK_SHOW_SELECTION_LEVEL")))
     {
       feedback.setShowSelectionLevelFeedback(Boolean.FALSE);
     }
@@ -576,7 +583,8 @@
     {
       feedback.setShowGraderComments(Boolean.TRUE);
     }
-    else
+    else if ("FALSE".equalsIgnoreCase(assessment.getAssessmentMetaDataByLabel(
+    "FEEDBACK_SHOW_GRADER_COMMENT")))
     {
       feedback.setShowGraderComments(Boolean.FALSE);
     }
@@ -586,7 +594,8 @@
     {
       feedback.setShowStatistics(Boolean.TRUE);
     }
-    else
+    else if ("FALSE".equalsIgnoreCase(assessment.getAssessmentMetaDataByLabel(
+    "FEEDBACK_SHOW_STATS")))
     {
       feedback.setShowStatistics(Boolean.FALSE);
     }
@@ -609,7 +618,8 @@
     {
       feedback.setFeedbackDelivery(feedback.FEEDBACK_ON_SUBMISSION);
     }
-    else
+    else if ("NO_FEEDBACK".equalsIgnoreCase(assessment.getAssessmentMetaDataByLabel(
+    "FEEDBACK_DELIVERY")))
     {
       feedback.setFeedbackDelivery(feedback.NO_FEEDBACK);
     }
@@ -618,7 +628,7 @@
     {
     	feedback.setFeedbackComponentOption(feedback.SELECT_COMPONENTS);
     }
-    else {
+    else if ("SHOW_TOTALSCORE_ONLY".equalsIgnoreCase(assessment.getAssessmentMetaDataByLabel("FEEDBACK_COMPONENT_OPTION"))){
     	feedback.setFeedbackComponentOption(feedback.SHOW_TOTALSCORE_ONLY);
     }
 
@@ -633,7 +643,8 @@
     {
       feedback.setFeedbackAuthoring(feedback.SECTIONLEVEL_FEEDBACK);
     }
-    else
+    else if ("BOTH".equalsIgnoreCase(assessment.getAssessmentMetaDataByLabel(
+    "FEEDBACK_AUTHORING")))
     {
       feedback.setFeedbackAuthoring(feedback.BOTH_FEEDBACK);
     }
@@ -864,7 +875,8 @@
       control.setAutoSubmit(AssessmentAccessControl.AUTO_SUBMIT);
       assessment.getData().addAssessmentMetaData("hasAutoSubmit", "true");
     }
-    else
+    else if("FALSE".equalsIgnoreCase(assessment.getAssessmentMetaDataByLabel(
+    "AUTO_SUBMIT")))
     {
       control.setAutoSubmit(AssessmentAccessControl.DO_NOT_AUTO_SUBMIT);
     }
@@ -876,7 +888,8 @@
     {
       control.setItemNavigation(control.LINEAR_ACCESS);
     }
-    else
+    else if ("RANDOM".equalsIgnoreCase(assessment.getAssessmentMetaDataByLabel(
+    "NAVIGATION")))
     {
       control.setItemNavigation(control.RANDOM_ACCESS);
     }
@@ -904,7 +917,8 @@
     {
       control.setAssessmentFormat(control.BY_PART);
     }
-    else
+    else if ("S".equalsIgnoreCase(assessment.getAssessmentMetaDataByLabel(
+    	"QUESTION_LAYOUT")))
     {
       control.setAssessmentFormat(control.BY_ASSESSMENT);
     }
@@ -915,7 +929,8 @@
     {
       control.setMarkForReview(control.MARK_FOR_REVIEW);
     }
-    else
+    else if ("False".equalsIgnoreCase(assessment.getAssessmentMetaDataByLabel(
+    "MARK_FOR_REVIEW")))
     {
       control.setMarkForReview(control.NOT_MARK_FOR_REVIEW);
     }
@@ -936,7 +951,7 @@
       control.setSubmissionsAllowed(AssessmentAccessControlIfc.
                                     UNLIMITED_SUBMISSIONS);
     }
-    else
+    else if(maxAttempts != null && !"".equals(maxAttempts) && !"null".equals(maxAttempts))
     {
       control.setUnlimitedSubmissions(Boolean.FALSE);
       try
@@ -958,7 +973,8 @@
     {
       control.setLateHandling(control.NOT_ACCEPT_LATE_SUBMISSION);
     }
-    else
+    else if ("TRUE".equalsIgnoreCase(assessment.getAssessmentMetaDataByLabel(
+    "LATE_HANDLING")))
     {
       control.setLateHandling(Integer.valueOf(1));