Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
===================================================================
diff -u -r51d4ec0a2ce479984ec5daf54c9a29029309428f -r8518d9067746b5286f01a9ed5679a8b60cff0e95
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision 51d4ec0a2ce479984ec5daf54c9a29029309428f)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision 8518d9067746b5286f01a9ed5679a8b60cff0e95)
@@ -766,13 +766,14 @@
 		    boolean answerBoolean = false;
 		    if (questionDto.isMultipleAnswersAllowed()) {
 			String answerString = request.getParameter(
-				AssessmentConstants.ATTR_QUESTION_PREFIX + i + "_" + optionDto.getSequenceId());
+				AssessmentConstants.ATTR_QUESTION_PREFIX + i + "_" + optionDto.getUid());
 			answerBoolean = !StringUtils.isBlank(answerString);
+			
 		    } else {
-			String answerString = request.getParameter(AssessmentConstants.ATTR_QUESTION_PREFIX + i);
-			if (answerString != null) {
-			    int optionSequenceId = Integer.parseInt(answerString);
-			    answerBoolean = (optionDto.getSequenceId() == optionSequenceId);
+			String optionUidSelectedStr = request.getParameter(AssessmentConstants.ATTR_QUESTION_PREFIX + i);
+			if (optionUidSelectedStr != null) {
+			    Long optionUidSelected = Long.parseLong(optionUidSelectedStr);
+			    answerBoolean = optionDto.getUid().equals(optionUidSelected);
 			}
 		    }
 		    optionDto.setAnswerBoolean(answerBoolean);
@@ -781,7 +782,7 @@
 	    } else if (questionType == AssessmentConstants.QUESTION_TYPE_MATCHING_PAIRS) {
 		for (OptionDTO optionDto : questionDto.getOptionDtos()) {
 		    int answerInt = WebUtil.readIntParam(request,
-			    AssessmentConstants.ATTR_QUESTION_PREFIX + i + "_" + optionDto.getSequenceId());
+			    AssessmentConstants.ATTR_QUESTION_PREFIX + i + "_" + optionDto.getUid());
 		    optionDto.setAnswerInt(answerInt);
 		}
 
@@ -808,7 +809,7 @@
 	    } else if (questionType == AssessmentConstants.QUESTION_TYPE_ORDERING) {
 		for (OptionDTO optionDto : questionDto.getOptionDtos()) {
 		    int answerSequenceId = WebUtil.readIntParam(request,
-			    AssessmentConstants.ATTR_QUESTION_PREFIX + i + "_" + optionDto.getSequenceId());
+			    AssessmentConstants.ATTR_QUESTION_PREFIX + i + "_" + optionDto.getUid());
 		    optionDto.setSequenceId(answerSequenceId);
 		}
 		//sort accrording to the new sequenceIds
@@ -821,7 +822,7 @@
 		//store hedging marks
 		for (OptionDTO optionDto : questionDto.getOptionDtos()) {
 		    Integer markHedging = WebUtil.readIntParam(request,
-			    AssessmentConstants.ATTR_QUESTION_PREFIX + i + "_" + optionDto.getSequenceId(), true);
+			    AssessmentConstants.ATTR_QUESTION_PREFIX + i + "_" + optionDto.getUid(), true);
 		    if (markHedging != null) {
 			optionDto.setAnswerInt(markHedging);
 		    }
Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -r51d4ec0a2ce479984ec5daf54c9a29029309428f -r8518d9067746b5286f01a9ed5679a8b60cff0e95
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 51d4ec0a2ce479984ec5daf54c9a29029309428f)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8518d9067746b5286f01a9ed5679a8b60cff0e95)
@@ -81,7 +81,7 @@
 								for (var i = 0; i < sortable.el.rows.length; i++) {
 									var tr = sortable.el.rows[i];
 									var input = $("input", $(tr));
-								    input.val(i+1);
+								    input.val(i);
 								}
 							}
 						}			            
Index: lams_tool_assessment/web/pages/learning/parts/markhedging.jsp
===================================================================
diff -u -ra76d96d2c8738e06130ab51ea379fe34bea5fbd8 -r8518d9067746b5286f01a9ed5679a8b60cff0e95
--- lams_tool_assessment/web/pages/learning/parts/markhedging.jsp	(.../markhedging.jsp)	(revision a76d96d2c8738e06130ab51ea379fe34bea5fbd8)
+++ lams_tool_assessment/web/pages/learning/parts/markhedging.jsp	(.../markhedging.jsp)	(revision 8518d9067746b5286f01a9ed5679a8b60cff0e95)
@@ -15,7 +15,7 @@
 				</td>
 				
 				<td style="width: 100px;">
-					<select name="question${questionIndex}_${option.sequenceId}" class="mark-hedging-select" data-question-index="${questionIndex}"
+					<select name="question${questionIndex}_${option.uid}" class="mark-hedging-select" data-question-index="${questionIndex}"
 						<c:if test="${!hasEditRight}">disabled="disabled"</c:if>				
 					>
 						
Index: lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp
===================================================================
diff -u -r4353f26f9509808acdf41d0deef6cf5fd458a2b7 -r8518d9067746b5286f01a9ed5679a8b60cff0e95
--- lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp	(.../matchingpairs.jsp)	(revision 4353f26f9509808acdf41d0deef6cf5fd458a2b7)
+++ lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp	(.../matchingpairs.jsp)	(revision 8518d9067746b5286f01a9ed5679a8b60cff0e95)
@@ -13,7 +13,7 @@
 				</td>
 				
 				<td style="width: 100px;">
-					<select name="question${status.index}_${option.sequenceId}" <c:if test="${!hasEditRight}">disabled="disabled"</c:if>>
+					<select name="question${status.index}_${option.uid}" <c:if test="${!hasEditRight}">disabled="disabled"</c:if>>
 						<option value="-1">
 							<fmt:message key="label.learning.matching.pairs.choose" />
 						</option>
Index: lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8518d9067746b5286f01a9ed5679a8b60cff0e95
--- lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp	(.../multiplechoice.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp	(.../multiplechoice.jsp)	(revision 8518d9067746b5286f01a9ed5679a8b60cff0e95)
@@ -18,13 +18,13 @@
 				<td class="${question.prefixAnswersWithLetters?'has-radio-button-prefix':'has-radio-button'}">
 					<c:choose>
 						<c:when test="${question.multipleAnswersAllowed}">
-							<input type="checkbox" name="question${status.index}_${option.sequenceId}" value="${true}"
+							<input type="checkbox" name="question${status.index}_${option.uid}" value="${true}"
 		 						<c:if test="${option.answerBoolean}">checked="checked"</c:if>
 								<c:if test="${!hasEditRight}">disabled="disabled"</c:if>
 							/>
 						</c:when>
 						<c:otherwise>
-							<input type="radio" name="question${status.index}" value="${option.sequenceId}"
+							<input type="radio" name="question${status.index}" value="${option.uid}"
 		 						<c:if test="${option.answerBoolean}">checked="checked"</c:if>
 		 						<c:if test="${!hasEditRight}">disabled="disabled"</c:if>
 							/>
Index: lams_tool_assessment/web/pages/learning/parts/ordering.jsp
===================================================================
diff -u -r51d4ec0a2ce479984ec5daf54c9a29029309428f -r8518d9067746b5286f01a9ed5679a8b60cff0e95
--- lams_tool_assessment/web/pages/learning/parts/ordering.jsp	(.../ordering.jsp)	(revision 51d4ec0a2ce479984ec5daf54c9a29029309428f)
+++ lams_tool_assessment/web/pages/learning/parts/ordering.jsp	(.../ordering.jsp)	(revision 8518d9067746b5286f01a9ed5679a8b60cff0e95)
@@ -10,7 +10,7 @@
 			<c:forEach var="option" items="${question.optionDtos}" varStatus="ordStatus">
 				<tr>
 					<td class="ordering-option">
-						<input type="hidden" name="question${status.index}_${option.sequenceId}" value="${ordStatus.index}" />
+						<input type="hidden" name="question${status.index}_${option.uid}" value="${ordStatus.index}" />
 						<c:out value="${option.optionString}" escapeXml="false" />
 					</td>
 				</tr>