Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/Assessment.java
===================================================================
diff -u -r4c5a620700d152367d81a3ad8cf1d0f0b94f86ac -r8be457696d7f17c6da2e89704fe7e128f1f8ea91
--- lams_central/src/java/org/lamsfoundation/lams/authoring/template/Assessment.java	(.../Assessment.java)	(revision 4c5a620700d152367d81a3ad8cf1d0f0b94f86ac)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/Assessment.java	(.../Assessment.java)	(revision 8be457696d7f17c6da2e89704fe7e128f1f8ea91)
@@ -24,9 +24,11 @@
 package org.lamsfoundation.lams.authoring.template;
 
 import java.text.MessageFormat;
-import java.util.LinkedList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.ResourceBundle;
+import java.util.Set;
+import java.util.TreeSet;
 
 import org.lamsfoundation.lams.rest.RestTags;
 
@@ -53,13 +55,14 @@
     Boolean required = false;
     int defaultGrade = 1;
     boolean multipleAnswersAllowed = false; // only used if type == 1
-    List<AssessMCAnswer> answers = null; // only used if type == 1
+    Set<AssessMCAnswer> answers = null; // only used if type == 1
     String uuid = null; // used when QTI gets imported and it contains QB question UUID
 
     public void setType(short type) {
 	this.type = type;
 	if (type == 1 && this.answers == null) {
-	    this.answers = new LinkedList<>();
+	    // JSP template pages expect this list to be in correct order
+	    this.answers = new TreeSet<>(Comparator.comparingInt(AssessMCAnswer::getSequenceId));
 	}
     }
 
@@ -107,7 +110,7 @@
 	this.defaultGrade = defaultGrade;
     }
 
-    public List<AssessMCAnswer> getAnswers() {
+    public Set<AssessMCAnswer> getAnswers() {
 	return answers;
     }
 
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
===================================================================
diff -u -rf6f3e50bca627b971bbd84d4aa341d3ea37890e2 -r8be457696d7f17c6da2e89704fe7e128f1f8ea91
--- lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java	(.../LdTemplateController.java)	(revision f6f3e50bca627b971bbd84d4aa341d3ea37890e2)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java	(.../LdTemplateController.java)	(revision 8be457696d7f17c6da2e89704fe7e128f1f8ea91)
@@ -1375,11 +1375,16 @@
 	request.setAttribute("containingDivName", WebUtil.readStrParam(request, "containingDivName", true));
 
 	String questionType = WebUtil.readStrParam(request, "questionType");
-	if (questionType == null || !questionType.equalsIgnoreCase("mcq")) {
-	    return "/authoring/template/tool/assessment";
-	} else {
-	    return "authoring/template/tool/assessmcq";
+	if (questionType != null) {
+	    if (questionType.equalsIgnoreCase("essay")) {
+		return "authoring/template/tool/assessmcq";
+	    }
+	    // if it is a import from Question Bank, we need to do further processing
+	    if (questionType.equalsIgnoreCase("importQbAe")) {
+		return "forward:importQbAe.do";
+	    }
 	}
+	return "/authoring/template/tool/assessmcq";
 
     }
 
@@ -1399,18 +1404,50 @@
     /**
      * Gets a QB question based on its UID and creates a structure for template wizard JSP.
      */
-    @RequestMapping("/importQb")
-    private String importQuestionFromQb(@RequestParam long qbQuestionUid, @RequestParam int questionNumber, Model model)
+    @RequestMapping("/importQbAe")
+    private String importAeQuestionFromQb(@RequestParam long qbQuestionUid, Model model)
 	    throws UnsupportedEncodingException {
 	QbQuestion qbQuestion = qbService.getQuestionByUid(qbQuestionUid);
 
 	Assessment question = new Assessment();
+	question.setType(qbQuestion.getType().shortValue());
+	question.setTitle(qbQuestion.getName());
+	question.setText(qbQuestion.getDescription());
+	question.setMultipleAnswersAllowed(qbQuestion.isMultipleAnswersAllowed());
+	question.setRequired(qbQuestion.isAnswerRequired());
+	question.setDefaultGrade(qbQuestion.getMaxMark());
+	question.setUuid(qbQuestion.getUuid().toString());
+
+	model.addAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, qbQuestion.getContentFolderId());
+	model.addAttribute("question", question);
+
+	if (question.getType() == Assessment.ASSESSMENT_QUESTION_TYPE_MULTIPLE_CHOICE) {
+	    Set<AssessMCAnswer> answers = question.getAnswers();
+	    for (QbOption qbOption : qbQuestion.getQbOptions()) {
+		AssessMCAnswer answer = new AssessMCAnswer(qbOption.getDisplayOrder(), qbOption.getName(),
+			qbOption.getMaxMark());
+		answers.add(answer);
+	    }
+	    return "/authoring/template/tool/assessmcq";
+	}
+	return "/authoring/template/tool/assessment";
+    }
+
+    /**
+     * Gets a QB question based on its UID and creates a structure for template wizard JSP.
+     */
+    @RequestMapping("/importQbIra")
+    private String importIraQuestionFromQb(@RequestParam long qbQuestionUid, @RequestParam int questionNumber,
+	    Model model) throws UnsupportedEncodingException {
+	QbQuestion qbQuestion = qbService.getQuestionByUid(qbQuestionUid);
+
+	Assessment question = new Assessment();
 	question.setType(Assessment.ASSESSMENT_QUESTION_TYPE_MULTIPLE_CHOICE);
 	question.setTitle(qbQuestion.getName());
 	question.setText(qbQuestion.getDescription());
 	question.setUuid(qbQuestion.getUuid().toString());
 
-	List<AssessMCAnswer> answers = question.getAnswers();
+	Set<AssessMCAnswer> answers = question.getAnswers();
 	for (QbOption qbOption : qbQuestion.getQbOptions()) {
 	    AssessMCAnswer answer = new AssessMCAnswer(qbOption.getDisplayOrder(), qbOption.getName(),
 		    qbOption.getMaxMark());
@@ -1566,9 +1603,9 @@
 		case ("peerreviewstar"):
 		    path = "authoring/template/tool/peerreviewstar";
 		    break;
-		case ("importQb"):
+		case ("importQbIra"):
 		    // further processing in another action method
-		    path = "forward:importQb.do";
+		    path = "forward:importQbIra.do";
 		    break;
 		default:
 		    path = null;
Index: lams_central/web/authoring/template/comms.jsp
===================================================================
diff -u -re137553ae8df8ba48da568c79e4deea0f5380d29 -r8be457696d7f17c6da2e89704fe7e128f1f8ea91
--- lams_central/web/authoring/template/comms.jsp	(.../comms.jsp)	(revision e137553ae8df8ba48da568c79e4deea0f5380d29)
+++ lams_central/web/authoring/template/comms.jsp	(.../comms.jsp)	(revision 8be457696d7f17c6da2e89704fe7e128f1f8ea91)
@@ -141,7 +141,7 @@
 	    	window.open(url,'QuestionFile','width=500,height=240,scrollbars=yes,top=150,left=' + left);
 	    }
 
-		function createAssessment(questionType, numAssessmentsFieldname, containingDivName ) {
+		function createAssessment(questionType, numAssessmentsFieldname, containingDivName, qbQuestionUid) {
 			var numAssessments = $('#'+numAssessmentsFieldname);
 			var type = questionType ? questionType : 'essay';
 			var currNum = numAssessments.val();
@@ -150,6 +150,9 @@
 			newDiv.id = containingDivName+'divassess'+nextNum;
 			newDiv.className = 'space-top space-sides';
 			var url=getSubmissionURL()+"/createAssessment.do?questionNumber="+nextNum+"&questionType="+type+"&containingDivName="+containingDivName;
+			if (qbQuestionUid) {
+				url += '&qbQuestionUid=' + qbQuestionUid;
+			}
 			$('#'+containingDivName).append(newDiv);
 			$.ajaxSetup({ cache: true });
 			$(newDiv).load(url, function( response, status, xhr ) {
Index: lams_central/web/authoring/template/tbl/appex.jsp
===================================================================
diff -u -r4c2d1f37b92435907ec4ce23cb635a7cd9e4161e -r8be457696d7f17c6da2e89704fe7e128f1f8ea91
--- lams_central/web/authoring/template/tbl/appex.jsp	(.../appex.jsp)	(revision 4c2d1f37b92435907ec4ce23cb635a7cd9e4161e)
+++ lams_central/web/authoring/template/tbl/appex.jsp	(.../appex.jsp)	(revision 8be457696d7f17c6da2e89704fe7e128f1f8ea91)
@@ -30,6 +30,9 @@
 			<div class="space-top space-sides">
 				<a href="#" id="divass${appexNumber}CEssay" onclick="javascript:createAssessment('essay', 'numAssessments${appexNumber}', 'divass${appexNumber}');" class="btn btn-default"><i class="fa fa-plus"></i> <fmt:message key="authoring.create.essay.question"/></a>
 				<a href="#" id="divass${appexNumber}CMCQ"  onclick="javascript:createAssessment('mcq', 'numAssessments${appexNumber}', 'divass${appexNumber}');" class="btn btn-default"><i class="fa fa-plus"></i> <fmt:message key="authoring.create.mc.question"/></a>
+				
+				<a href="#" id="divass${appexNumber}CQB" onClick="javascript:openQuestionBank(${appexNumber})" class="btn btn-default"><i class="fa fa-upload"></i> <fmt:message key="authoring.create.question.qb" /></a>
+				
 				<a href="#" id="divass${appexNumber}CQTI" onClick="javascript:importQTI('appex${appexNumber}')" class="btn btn-default pull-right"><i class="fa fa-upload"></i> <fmt:message key="authoring.template.basic.import.qti" /></a>
 			</div>
 			<div class="space-top space-sides space-bottom">
@@ -41,6 +44,23 @@
 					<lams:CKEditor id="divappex${appexNumber}NBEntry" value="" contentFolderID="${contentFolderID}" height="100"></lams:CKEditor>
 				</div>
 			</div>
+			
+			<!-- Question Bank for this Application Excercise -->
+			<div class="panel-group question-bank-ae-div" id="question-bank-ae-div-${appexNumber}" role="tablist" aria-multiselectable="true"> 
+			    <div class="panel panel-default">
+			        <div class="panel-heading collapsable-icon-left" id="question-bank-ae-heading-${appexNumber}">
+			        	<span class="panel-title">
+					    	<a role="button" data-toggle="collapse" href="#question-bank-ae-collapse-${appexNumber}" aria-expanded="true" aria-controls="question-bank-ae-collapse-${appexNumber}" >
+				          		<fmt:message key="label.question.bank" />
+				        	</a>
+			      		</span>
+			        </div>
+			
+					<div id="question-bank-ae-collapse-${appexNumber}" class="panel-body panel-collapse collapse in" role="tabpanel" aria-labelledby="question-bank-ae-heading-${appexNumber}">
+						<i class="fa fa-refresh fa-spin fa-2x fa-fw" style="margin: auto; display: block"></i>			
+					</div>
+				</div>
+			</div>
 	</div>
 	
 	<script type="text/javascript">
Index: lams_central/web/authoring/template/tbl/tbl.jsp
===================================================================
diff -u -r57c3f1b5f6a9799a65acac583c4d40a2839ed290 -r8be457696d7f17c6da2e89704fe7e128f1f8ea91
--- lams_central/web/authoring/template/tbl/tbl.jsp	(.../tbl.jsp)	(revision 57c3f1b5f6a9799a65acac583c4d40a2839ed290)
+++ lams_central/web/authoring/template/tbl/tbl.jsp	(.../tbl.jsp)	(revision 8be457696d7f17c6da2e89704fe7e128f1f8ea91)
@@ -14,8 +14,8 @@
  	<link rel="stylesheet" href="<lams:LAMSURL/>css/x-editable.css"> 
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/x-editable-lams.css"> 
 	<style>
-		/* Hide it initially */
-		#question-bank-div {
+		/* Hide them initially */
+		#question-bank-ira-div, .question-bank-ae-div {
 			display: none;
 			margin-top: 20px;
 		}
@@ -34,6 +34,8 @@
 
 		var minimumWordsSpinnerArray  = new Array(); // Peer Review Tab.
 		var showTime = 100; // how long should it take a field to show/hide.
+		var qbQuestionAddAppexNumber = null; // if null, we are importin IRA question from QB
+											 // otherwise we are importing a question for the given AE
 		
 		$(document).ready(function() {
 			groupingChanged();
@@ -67,7 +69,7 @@
 			initializeWizard(validator);
 		});
 
-		function createApplicationExercise(numAppexFieldname ) {
+		function createApplicationExercise() {
 			var numAppex = $('#numAppEx');
 			var currNum = numAppex.val();
 			var nextNum = +currNum + 1;
@@ -139,18 +141,20 @@
 	    	}
 	    }
 	    
-	    function openQuestionBank(){
+	    function openQuestionBank(appexNumber){
+	    	// empty field for IRA import
+	    	qbQuestionAddAppexNumber = appexNumber;
 	    	// show panel
-	    	$('#question-bank-div').slideDown(function(){
+	    	$(appexNumber ? '#question-bank-ae-div-' + appexNumber : '#question-bank-ira-div').slideDown(function(){
 	    		// load question bank content
-				$('#question-bank-collapse').load(
+				$(appexNumber ? '#question-bank-ae-collapse-' + appexNumber : '#question-bank-ira-collapse').load(
 					"<lams:LAMSURL/>searchQB/start.do",
 					{
 						// this action returns ID of the created QB question
 						// which is put into itemArea div
 						returnUrl: "<lams:LAMSURL/>qb/edit/returnQuestionUid.do",
-						// limit question to multiple choice
-						toolSignature: "lamc11"
+						// limit question to multiple choice (ira) or essay and multiple choice (ae)
+						toolSignature: appexNumber ? "lasurv11" : "lamc11"
 					}
 				);
 		    });
@@ -160,10 +164,18 @@
 		function refreshThickbox(){
 			// extract the ID
 			var qbQuestionUid = +$("#itemArea").text();
-			// fetch HTML with filled data from QB question
-			createQuestion('numQuestions', 'divq', 'divquestions', 'importQb', '&qbQuestionUid=' + qbQuestionUid);
-			
-			$('#question-bank-div').slideUp();
+			if (qbQuestionAddAppexNumber) {
+				createAssessment('importQbAe', 'numAssessments' + qbQuestionAddAppexNumber, 'divass' + qbQuestionAddAppexNumber, qbQuestionUid);
+				$('#question-bank-ae-div-' + qbQuestionAddAppexNumber).slideUp(function(){
+					$('#question-bank-ae-collapse-' + qbQuestionAddAppexNumber, this).empty();
+				});
+			} else {
+				// fetch HTML with filled data from QB question
+				createQuestion('numQuestions', 'divq', 'divquestions', 'importQbIra', '&qbQuestionUid=' + qbQuestionUid);
+				$('#question-bank-ira-div').slideUp(function(){
+					$('#question-bank-ira-collapse', this).empty();
+				});
+			}
 		};
 
         $(document).ready(function(){
@@ -252,7 +264,7 @@
 					</button>
 					<ul class="dropdown-menu">
 						<li><a href="#" onClick="javascript:openQuestionBank()"> 
-								<fmt:message key="authoring.create.question.qb"/>
+								<i class="fa fa-upload"></i> <fmt:message key="authoring.create.question.qb"/>
 							</a>
 						</li>
 					</ul>
@@ -262,17 +274,17 @@
 			</span>
 			
 			<!-- Question Bank -->
-			<div class="panel-group" id="question-bank-div" role="tablist" aria-multiselectable="true"> 
+			<div class="panel-group" id="question-bank-ira-div" role="tablist" aria-multiselectable="true"> 
 			    <div class="panel panel-default">
-			        <div class="panel-heading collapsable-icon-left" id="question-bank-heading">
+			        <div class="panel-heading collapsable-icon-left" id="question-bank-ira-heading">
 			        	<span class="panel-title">
-					    	<a role="button" data-toggle="collapse" href="#question-bank-collapse" aria-expanded="true" aria-controls="question-bank-collapse" >
+					    	<a role="button" data-toggle="collapse" href="#question-bank-ira-collapse" aria-expanded="true" aria-controls="question-bank-ira-collapse" >
 				          		<fmt:message key="label.question.bank" />
 				        	</a>
 			      		</span>
 			        </div>
 			
-					<div id="question-bank-collapse" class="panel-body panel-collapse collapse in" role="tabpanel" aria-labelledby="question-bank-heading">
+					<div id="question-bank-ira-collapse" class="panel-body panel-collapse collapse in" role="tabpanel" aria-labelledby="question-bank-ira-heading">
 						<i class="fa fa-refresh fa-spin fa-2x fa-fw" style="margin: auto; display: block"></i>			
 					</div>
 				</div>
Index: lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
===================================================================
diff -u -r44a15683ec36c490334d7056ef9294f666bcd170 -r8be457696d7f17c6da2e89704fe7e128f1f8ea91
--- lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java	(.../QbQuestion.java)	(revision 44a15683ec36c490334d7056ef9294f666bcd170)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java	(.../QbQuestion.java)	(revision 8be457696d7f17c6da2e89704fe7e128f1f8ea91)
@@ -186,6 +186,7 @@
 			    //changed option maxMark (Assessment tool) or correctness of the option (MCQ/Scratchie/Q&A)
 			    || (oldOption.getMaxMark() != newOption.getMaxMark())) {
 			isModificationRequiresNewVersion = true;
+			break;
 		    }
 		}
 	    }
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -r9de4a5d9b2c6710a0c8243b90f7ff6be8cf9ae83 -r8be457696d7f17c6da2e89704fe7e128f1f8ea91
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 9de4a5d9b2c6710a0c8243b90f7ff6be8cf9ae83)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 8be457696d7f17c6da2e89704fe7e128f1f8ea91)
@@ -3513,9 +3513,22 @@
 		List<QbOption> optionList = new ArrayList<>();
 		ArrayNode optionsData = JsonUtil.optArray(questionJSONData, RestTags.ANSWERS);
 		for (JsonNode answerData : optionsData) {
-		    QbOption option = new QbOption();
-		    option.setQbQuestion(qbQuestion);
-		    option.setDisplayOrder(JsonUtil.optInt(answerData, RestTags.DISPLAY_ORDER));
+		    int displayOrder = JsonUtil.optInt(answerData, RestTags.DISPLAY_ORDER);
+		    QbOption option = null;
+		    // check if existing question gets modified or do we create a new one
+		    for (QbOption existingOption : qbQuestion.getQbOptions()) {
+			if (existingOption.getDisplayOrder() == displayOrder) {
+			    option = existingOption;
+			    break;
+			}
+		    }
+		    if (option == null) {
+			option = new QbOption();
+			option.setDisplayOrder(displayOrder);
+			option.setQbQuestion(qbQuestion);
+		    }
+		    
+		  
 		    Boolean correct = JsonUtil.optBoolean(answerData, RestTags.CORRECT, null);
 		    if (correct == null) {
 			Double grade = JsonUtil.optDouble(answerData, "grade");