Index: lams_central/web/qb/qbQuestionDetails.jsp
===================================================================
diff -u -r72c9800d4076fa450caff0943dd4de41399c83e0 -r69448cd1b22b367f5221efed0730303edc27404c
--- lams_central/web/qb/qbQuestionDetails.jsp	(.../qbQuestionDetails.jsp)	(revision 72c9800d4076fa450caff0943dd4de41399c83e0)
+++ lams_central/web/qb/qbQuestionDetails.jsp	(.../qbQuestionDetails.jsp)	(revision 69448cd1b22b367f5221efed0730303edc27404c)
@@ -54,7 +54,7 @@
 			<table class="table table-striped table-hover table-condensed">
 				<c:forEach var="option" items="${question.qbOptions}" varStatus="i">
 					<tr>
-						<td width="5px" style="    padding-right: 0;">
+						<td width="5px" style="padding-right: 0;">
 							<c:if test="${option.correct}">
 								<i class="fa fa-check text-success"></i>
 							</c:if>
Index: lams_central/web/qb/search.jsp
===================================================================
diff -u -r72c9800d4076fa450caff0943dd4de41399c83e0 -r69448cd1b22b367f5221efed0730303edc27404c
--- lams_central/web/qb/search.jsp	(.../search.jsp)	(revision 72c9800d4076fa450caff0943dd4de41399c83e0)
+++ lams_central/web/qb/search.jsp	(.../search.jsp)	(revision 69448cd1b22b367f5221efed0730303edc27404c)
@@ -134,7 +134,10 @@
 			jQuery("#questions-grid").jqGrid({
 			   	multiselect: false,
 				datatype: "json",
-				url: "<c:url value="/searchQB/getPagedQuestions.do"/>?questionType=${questionType}",
+				url: "<c:url value="/searchQB/getPagedQuestions.do"/>",
+				postData: { 
+	           		questionType: ${questionType} 
+		        },
 				height: '100%',
 				autowidth: true,
 				shrinkToFit: true,
@@ -238,9 +241,11 @@
 	    }
 		function gridSearch(){
 			$("#questions-grid").jqGrid(
-				'setGridParam', 
-				{
-		           	postData: { searchString: $("#filter-questions").val() }
+				'setGridParam', {
+		           	postData: { 
+		           		questionType: $("#question-type").val(),
+			           	searchString: $("#filter-questions").val() 
+			        }
 		       	}, 
 				{ page: 1 }
 			).trigger('reloadGrid');
@@ -280,40 +285,41 @@
 					onkeydown="doSearch(arguments[0]||event)" />
 		
 				<c:if test="${!empty questionTypesAvailable}">
-					<span id="question-type" class="form-control loffset5 disabled-span">
+					<span class="form-control loffset5 disabled-span">
 					Type:
-					<select id="questionType">
-						<c:forTokens items="${questionTypesAvailable}" delims="," var="questionTypeIter"></c:forTokens>
-  						<option value="${questionTypeIter}"
-  							<c:if test="${questionTypeIter == questionType}">selected="selected"</c:if>>
-  							
-							<c:choose>
-								<c:when test="${questionTypeIter == 1}">
-									<fmt:message key="label.question.type.multiple.choice" />
-								</c:when>
-								<c:when test="${questionTypeIter == 2}">
-									<fmt:message key="label.question.type.matching.pairs" />
-								</c:when>
-								<c:when test="${questionTypeIter == 3}">
-									<fmt:message key="label.question.type.short.answer" />
-								</c:when>
-								<c:when test="${questionTypeIter == 4}">
-									<fmt:message key="label.question.type.numerical" />
-								</c:when>
-								<c:when test="${questionTypeIter == 5}">
-									<fmt:message key="label.question.type.true.false" />
-								</c:when>
-								<c:when test="${questionTypeIter == 6}">
-									<fmt:message key="label.question.type.essay" />
-								</c:when>
-								<c:when test="${questionTypeIter == 7}">
-									<fmt:message key="label.question.type.ordering" />
-								</c:when>
-								<c:when test="${questionTypeIter == 8}">
-									<fmt:message key="label.question.type.mark.hedging" />
-								</c:when>
-							</c:choose>
-						</option>
+					<select id="question-type" onchange="gridSearch();">
+						<c:forTokens items="${questionTypesAvailable}" delims="," var="questionTypeIter">
+	  						<option value="${questionTypeIter}"
+	  							<c:if test="${questionTypeIter == questionType}">selected="selected"</c:if>>
+	  							
+								<c:choose>
+									<c:when test="${questionTypeIter == 1}">
+										<fmt:message key="label.question.type.multiple.choice" />
+									</c:when>
+									<c:when test="${questionTypeIter == 2}">
+										<fmt:message key="label.question.type.matching.pairs" />
+									</c:when>
+									<c:when test="${questionTypeIter == 3}">
+										<fmt:message key="label.question.type.short.answer" />
+									</c:when>
+									<c:when test="${questionTypeIter == 4}">
+										<fmt:message key="label.question.type.numerical" />
+									</c:when>
+									<c:when test="${questionTypeIter == 5}">
+										<fmt:message key="label.question.type.true.false" />
+									</c:when>
+									<c:when test="${questionTypeIter == 6}">
+										<fmt:message key="label.question.type.essay" />
+									</c:when>
+									<c:when test="${questionTypeIter == 7}">
+										<fmt:message key="label.question.type.ordering" />
+									</c:when>
+									<c:when test="${questionTypeIter == 8}">
+										<fmt:message key="label.question.type.mark.hedging" />
+									</c:when>
+								</c:choose>
+							</option>
+						</c:forTokens>
 					</select>
 					</span>
 				</c:if>
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
===================================================================
diff -u -rb41c8a8bc5134e78088378360a37f3906fadb3de -r69448cd1b22b367f5221efed0730303edc27404c
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql	(.../patch20190110.sql)	(revision b41c8a8bc5134e78088378360a37f3906fadb3de)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql	(.../patch20190110.sql)	(revision 69448cd1b22b367f5221efed0730303edc27404c)
@@ -6,7 +6,7 @@
 
 -- Create QB question table
 CREATE TABLE lams_qb_question (`uid` BIGINT AUTO_INCREMENT, 
-							   `local` TINYINT(1) NOT NULL DEFAULT 1,
+							   `local` TINYINT(1) NOT NULL DEFAULT 0,
 							   `type` TINYINT NOT NULL,
 							   `question_id` INT NOT NULL,
 							   `version` SMALLINT NOT NULL DEFAULT 1,
@@ -117,7 +117,7 @@
 SET @question_id = (SELECT IF(MAX(question_id) IS NULL, 0, MAX(question_id)) FROM lams_qb_question);
 							   
 INSERT INTO lams_qb_question (uid, `local`, `type`, question_id, version, create_date, name, description, max_mark, feedback, tmp_question_id) 
-	SELECT NULL, 1, 1, @question_id:=@question_id + 1, 1, IFNULL(c.creation_date, NOW()),
+	SELECT NULL, 0, 1, @question_id:=@question_id + 1, 1, IFNULL(c.creation_date, NOW()),
 		mcq.question, NULL, IFNULL(mcq.max_mark, 1), mcq.feedback, q.target_uid
 	FROM (SELECT uid,
 				 TRIM(question) AS question,
@@ -228,7 +228,7 @@
 	
 -- fill Question Bank question table with unique questions, with manually incremented question ID
 INSERT INTO lams_qb_question (uid, `local`, `type`, question_id, version, create_date, name, description, max_mark, feedback, tmp_question_id)
-	SELECT NULL, 1, 1, @question_id:=@question_id + 1, 1, sq.create_date, 
+	SELECT NULL, 0, 1, @question_id:=@question_id + 1, 1, sq.create_date, 
 		sq.question, sq.description, NULL, NULL, q.target_uid
 	FROM (SELECT uid,
 				 TRIM(title) AS question,
@@ -406,7 +406,7 @@
 
 	
 -- fill Question Bank question table with unique questions, with manually incremented question ID
-INSERT INTO lams_qb_question SELECT NULL, aq.question_type, 1, @question_id:=@question_id + 1, 1, IFNULL(assessment.create_date, NOW()), 
+INSERT INTO lams_qb_question SELECT NULL, 0, aq.question_type, @question_id:=@question_id + 1, 1, IFNULL(assessment.create_date, NOW()), 
 				aq.question, aq.description, IFNULL(aq.max_mark, 1), aq.feedback, aq.penalty_factor, aq.answer_required,
 				aq.multiple_answers_allowed, aq.incorrect_answer_nullifies_mark, aq.feedback_on_correct, aq.feedback_on_partially_correct,
 				aq.feedback_on_incorrect, aq.shuffle, aq.prefix_answers_with_letters, aq.case_sensitive, aq.correct_answer,
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
===================================================================
diff -u -rb76fdcd16012d4a2c05880ce0ed1cd3eea7965d0 -r69448cd1b22b367f5221efed0730303edc27404c
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision b76fdcd16012d4a2c05880ce0ed1cd3eea7965d0)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 69448cd1b22b367f5221efed0730303edc27404c)
@@ -144,9 +144,6 @@
 	    throws ServletException {
 	Long contentId = WebUtil.readLongParam(request, AssessmentConstants.PARAM_TOOL_CONTENT_ID);
 
-	List<AssessmentQuestion> questions = null;
-	Assessment assessment = null;
-
 	// initial Session Map
 	SessionMap<String, Object> sessionMap = new SessionMap<>();
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
@@ -155,8 +152,10 @@
 	// Get contentFolderID and save to form.
 	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
 	sessionMap.put(AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID);
+	sessionMap.put(AttributeNames.PARAM_TOOL_CONTENT_ID, contentId);
 	assessmentForm.setContentFolderID(contentFolderID);
 
+	Assessment assessment = null;
 	try {
 	    assessment = service.getAssessmentByContentId(contentId);
 	    // if assessment does not exist, try to use default content instead.
@@ -170,6 +169,7 @@
 	    throw new ServletException(e);
 	}
 
+	List<AssessmentQuestion> questions = null;
 	if (assessment.getQuestions() != null) {
 	    questions = new ArrayList<AssessmentQuestion>(assessment.getQuestions());
 	} else {
@@ -487,43 +487,20 @@
 	Long qbQuestionUid = WebUtil.readLongParam(request, "qbQuestionUid");
 	QbQuestion qbQuestion = qbService.getQbQuestionByUid(qbQuestionUid);
 	
+	//create new ScratchieItem and assign imported qbQuestion to it
+	AssessmentQuestion question = new AssessmentQuestion();
+	question.setQbQuestion(qbQuestion);
+	int maxSeq = 1;
+	if (questionList != null && questionList.size() > 0) {
+	    AssessmentQuestion last = questionList.last();
+	    maxSeq = last.getDisplayOrder() + 1;
+	}
+	question.setDisplayOrder(maxSeq);
+	question.setQbQuestionModified(IQbService.QUESTION_MODIFIED_NONE);
+	questionList.add(question);
 	
-	
-//	// check whether it is "edit(old Question)" or "add(new Question)"
-//	extractFormToAssessmentQuestion(request, questionList, questionForm, isAuthoringRestricted);
-//
-//	reinitializeAvailableQuestions(sessionMap);
-//	
-//	
-//	
-//	
-//	//create new ScratchieItem and assign imported qbQuestion to it
-//	ScratchieItem item = new ScratchieItem();
-//	item.setQbQuestion(qbQuestion);
-//	int maxSeq = 1;
-//	if (itemList != null && itemList.size() > 0) {
-//	    ScratchieItem last = itemList.last();
-//	    maxSeq = last.getDisplayOrder() + 1;
-//	}
-//	item.setDisplayOrder(maxSeq);
-//	item.setQbQuestionModified(IQbService.QUESTION_MODIFIED_NONE);
-//	itemList.add(item);
-	
-	
-	
-	
-	
-	
+	reinitializeAvailableQuestions(sessionMap);
 
-
-	// evict everything manually as we do not use DTOs, just real entities
-	// without eviction changes would be saved immediately into DB
-//	scratchieService.releaseFromCache(item);
-//	scratchieService.releaseFromCache(item);
-//	scratchieService.releaseFromCache(item.getQbQuestion());
-	
-//	request.setAttribute("qbQuestionModified", item.getQbQuestionModified());
-
 	// set session map ID so that itemlist.jsp can get sessionMAP
 	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 	return "pages/authoring/parts/questionlist";
@@ -1156,62 +1133,63 @@
 	    }
 	}
 	
-	QbQuestion baseLine = question.getQbQuestion().clone();
+	QbQuestion qbQuestion = question.getQbQuestion();
+	QbQuestion baseLine = qbQuestion.clone();
 	// evict everything manually as we do not use DTOs, just real entities
 	// without eviction changes would be saved immediately into DB
 	service.releaseFromCache(question);
 	service.releaseFromCache(baseLine);
-	service.releaseFromCache(question.getQbQuestion());
+	service.releaseFromCache(qbQuestion);
 
-	question.getQbQuestion().setName(questionForm.getTitle());
-	question.getQbQuestion().setDescription(questionForm.getQuestion());
+	qbQuestion.setName(questionForm.getTitle());
+	qbQuestion.setDescription(questionForm.getQuestion());
 
 	if (!isAuthoringRestricted) {
-	    question.getQbQuestion().setMaxMark(Integer.parseInt(questionForm.getMaxMark()));
+	    qbQuestion.setMaxMark(Integer.parseInt(questionForm.getMaxMark()));
 	}
-	question.getQbQuestion().setFeedback(questionForm.getFeedback());
-	question.getQbQuestion().setAnswerRequired(questionForm.isAnswerRequired());
+	qbQuestion.setFeedback(questionForm.getFeedback());
+	qbQuestion.setAnswerRequired(questionForm.isAnswerRequired());
 
 	Integer type = questionForm.getQuestionType();
 	if (type == QbQuestion.TYPE_MULTIPLE_CHOICE) {
-	    question.getQbQuestion().setMultipleAnswersAllowed(questionForm.isMultipleAnswersAllowed());
+	    qbQuestion.setMultipleAnswersAllowed(questionForm.isMultipleAnswersAllowed());
 	    boolean incorrectAnswerNullifiesMark = questionForm.isMultipleAnswersAllowed()
 		    ? questionForm.isIncorrectAnswerNullifiesMark()
 		    : false;
-	    question.getQbQuestion().setIncorrectAnswerNullifiesMark(incorrectAnswerNullifiesMark);
-	    question.getQbQuestion().setPenaltyFactor(Float.parseFloat(questionForm.getPenaltyFactor()));
-	    question.getQbQuestion().setShuffle(questionForm.isShuffle());
-	    question.getQbQuestion().setPrefixAnswersWithLetters(questionForm.isPrefixAnswersWithLetters());
-	    question.getQbQuestion().setFeedbackOnCorrect(questionForm.getFeedbackOnCorrect());
-	    question.getQbQuestion().setFeedbackOnPartiallyCorrect(questionForm.getFeedbackOnPartiallyCorrect());
-	    question.getQbQuestion().setFeedbackOnIncorrect(questionForm.getFeedbackOnIncorrect());
+	    qbQuestion.setIncorrectAnswerNullifiesMark(incorrectAnswerNullifiesMark);
+	    qbQuestion.setPenaltyFactor(Float.parseFloat(questionForm.getPenaltyFactor()));
+	    qbQuestion.setShuffle(questionForm.isShuffle());
+	    qbQuestion.setPrefixAnswersWithLetters(questionForm.isPrefixAnswersWithLetters());
+	    qbQuestion.setFeedbackOnCorrect(questionForm.getFeedbackOnCorrect());
+	    qbQuestion.setFeedbackOnPartiallyCorrect(questionForm.getFeedbackOnPartiallyCorrect());
+	    qbQuestion.setFeedbackOnIncorrect(questionForm.getFeedbackOnIncorrect());
 	} else if ((type == QbQuestion.TYPE_MATCHING_PAIRS)) {
-	    question.getQbQuestion().setPenaltyFactor(Float.parseFloat(questionForm.getPenaltyFactor()));
-	    question.getQbQuestion().setShuffle(questionForm.isShuffle());
+	    qbQuestion.setPenaltyFactor(Float.parseFloat(questionForm.getPenaltyFactor()));
+	    qbQuestion.setShuffle(questionForm.isShuffle());
 	} else if ((type == QbQuestion.TYPE_SHORT_ANSWER)) {
-	    question.getQbQuestion().setPenaltyFactor(Float.parseFloat(questionForm.getPenaltyFactor()));
-	    question.getQbQuestion().setCaseSensitive(questionForm.isCaseSensitive());
+	    qbQuestion.setPenaltyFactor(Float.parseFloat(questionForm.getPenaltyFactor()));
+	    qbQuestion.setCaseSensitive(questionForm.isCaseSensitive());
 	} else if ((type == QbQuestion.TYPE_NUMERICAL)) {
-	    question.getQbQuestion().setPenaltyFactor(Float.parseFloat(questionForm.getPenaltyFactor()));
+	    qbQuestion.setPenaltyFactor(Float.parseFloat(questionForm.getPenaltyFactor()));
 	} else if ((type == QbQuestion.TYPE_TRUE_FALSE)) {
-	    question.getQbQuestion().setPenaltyFactor(Float.parseFloat(questionForm.getPenaltyFactor()));
-	    question.getQbQuestion().setCorrectAnswer(questionForm.isCorrectAnswer());
-	    question.getQbQuestion().setFeedbackOnCorrect(questionForm.getFeedbackOnCorrect());
-	    question.getQbQuestion().setFeedbackOnIncorrect(questionForm.getFeedbackOnIncorrect());
+	    qbQuestion.setPenaltyFactor(Float.parseFloat(questionForm.getPenaltyFactor()));
+	    qbQuestion.setCorrectAnswer(questionForm.isCorrectAnswer());
+	    qbQuestion.setFeedbackOnCorrect(questionForm.getFeedbackOnCorrect());
+	    qbQuestion.setFeedbackOnIncorrect(questionForm.getFeedbackOnIncorrect());
 	} else if ((type == QbQuestion.TYPE_ESSAY)) {
-	    question.getQbQuestion().setAllowRichEditor(questionForm.isAllowRichEditor());
-	    question.getQbQuestion().setMaxWordsLimit(questionForm.getMaxWordsLimit());
-	    question.getQbQuestion().setMinWordsLimit(questionForm.getMinWordsLimit());
+	    qbQuestion.setAllowRichEditor(questionForm.isAllowRichEditor());
+	    qbQuestion.setMaxWordsLimit(questionForm.getMaxWordsLimit());
+	    qbQuestion.setMinWordsLimit(questionForm.getMinWordsLimit());
 	} else if (type == QbQuestion.TYPE_ORDERING) {
-	    question.getQbQuestion().setPenaltyFactor(Float.parseFloat(questionForm.getPenaltyFactor()));
-	    question.getQbQuestion().setFeedbackOnCorrect(questionForm.getFeedbackOnCorrect());
-	    question.getQbQuestion().setFeedbackOnIncorrect(questionForm.getFeedbackOnIncorrect());
+	    qbQuestion.setPenaltyFactor(Float.parseFloat(questionForm.getPenaltyFactor()));
+	    qbQuestion.setFeedbackOnCorrect(questionForm.getFeedbackOnCorrect());
+	    qbQuestion.setFeedbackOnIncorrect(questionForm.getFeedbackOnIncorrect());
 	} else if (type == QbQuestion.TYPE_MARK_HEDGING) {
-	    question.getQbQuestion().setShuffle(questionForm.isShuffle());
-	    question.getQbQuestion().setFeedbackOnCorrect(questionForm.getFeedbackOnCorrect());
-	    question.getQbQuestion().setFeedbackOnPartiallyCorrect(questionForm.getFeedbackOnPartiallyCorrect());
-	    question.getQbQuestion().setFeedbackOnIncorrect(questionForm.getFeedbackOnIncorrect());
-	    question.getQbQuestion().setHedgingJustificationEnabled(questionForm.isHedgingJustificationEnabled());
+	    qbQuestion.setShuffle(questionForm.isShuffle());
+	    qbQuestion.setFeedbackOnCorrect(questionForm.getFeedbackOnCorrect());
+	    qbQuestion.setFeedbackOnPartiallyCorrect(questionForm.getFeedbackOnPartiallyCorrect());
+	    qbQuestion.setFeedbackOnIncorrect(questionForm.getFeedbackOnIncorrect());
+	    qbQuestion.setHedgingJustificationEnabled(questionForm.isHedgingJustificationEnabled());
 	}
 
 	// set options
@@ -1228,7 +1206,7 @@
 		option.setDisplayOrder(displayOrder++);
 		options.add(option);
 	    }
-	    question.getQbQuestion().setQbOptions(options);
+	    qbQuestion.setQbOptions(options);
 	}
 	// set units
 	if (type == QbQuestion.TYPE_NUMERICAL) {
@@ -1239,10 +1217,10 @@
 		unit.setDisplayOrder(displayOrder++);
 		units.add(unit);
 	    }
-	    question.getQbQuestion().setUnits(units);
+	    qbQuestion.setUnits(units);
 	}
 	
-	question.setQbQuestionModified(service.isQbQuestionModified(baseLine, question.getQbQuestion()));
+	question.setQbQuestionModified(service.isQbQuestionModified(baseLine, qbQuestion));
 	request.setAttribute("qbQuestionModified", question.getQbQuestionModified());
     }
 
Index: lams_tool_assessment/web/pages/authoring/basic.jsp
===================================================================
diff -u -r9c3a64b840753192b333afb73c8fe7bdb54be638 -r69448cd1b22b367f5221efed0730303edc27404c
--- lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 9c3a64b840753192b333afb73c8fe7bdb54be638)
+++ lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 69448cd1b22b367f5221efed0730303edc27404c)
@@ -12,7 +12,7 @@
 	});
 
 	//The panel of assessment list panel
-	var questionListTargetDiv = "#questionListArea";
+	var questionListTargetDiv = "#itemArea";
 	function deleteQuestion(questionDisplayOrder){
 		var	deletionConfirmed = confirm("<fmt:message key="warning.msg.authoring.do.you.want.to.delete"></fmt:message>");
 
@@ -181,7 +181,7 @@
 	</lams:CKEditor>
 </div>
 
-<div id="questionListArea">
+<div id="itemArea">
 	<c:set var="sessionMapID" value="${assessmentForm.sessionMapID}" />
 	<c:choose>
 		<c:when test="${isAuthoringRestricted}">
Index: lams_tool_assessment/web/pages/authoring/importQuestions.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r69448cd1b22b367f5221efed0730303edc27404c
--- lams_tool_assessment/web/pages/authoring/importQuestions.jsp	(.../importQuestions.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_assessment/web/pages/authoring/importQuestions.jsp	(.../importQuestions.jsp)	(revision 69448cd1b22b367f5221efed0730303edc27404c)
@@ -50,7 +50,7 @@
 
 			document.getElementById('itemAttachment_Busy').style.display = '';
 			var options = { 
-		    	   	target:  parent.jQuery('#questionListArea'), 
+		    	   	target:  parent.jQuery('#itemArea'), 
 		    	   	success: afterRatingSubmit  // post-submit callback
 	    	}; 							
 	    	$('#importForm').ajaxSubmit(options);
Index: lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
===================================================================
diff -u -r9c3a64b840753192b333afb73c8fe7bdb54be638 -r69448cd1b22b367f5221efed0730303edc27404c
--- lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	(.../addessay.jsp)	(revision 9c3a64b840753192b333afb73c8fe7bdb54be638)
+++ lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	(.../addessay.jsp)	(revision 69448cd1b22b367f5221efed0730303edc27404c)
@@ -44,7 +44,7 @@
 	    			$("#feedback").val(CKEDITOR.instances.feedback.getData());
 	     			    
 	    	    	var options = { 
-	    	    		target:  parent.jQuery('#questionListArea'), 
+	    	    		target:  parent.jQuery('#itemArea'), 
 	    		   		success: afterRatingSubmit  // post-submit callback
 	    		    }; 				
 
Index: lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp
===================================================================
diff -u -r9c3a64b840753192b333afb73c8fe7bdb54be638 -r69448cd1b22b367f5221efed0730303edc27404c
--- lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision 9c3a64b840753192b333afb73c8fe7bdb54be638)
+++ lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision 69448cd1b22b367f5221efed0730303edc27404c)
@@ -45,7 +45,7 @@
 		    		$("#feedbackOnIncorrect").val(CKEDITOR.instances.feedbackOnIncorrect.getData());
 		    			
 		    	   	var options = { 
-		    	   		target:  parent.jQuery('#questionListArea'), 
+		    	   		target:  parent.jQuery('#itemArea'), 
 		    	   		success: afterRatingSubmit  // post-submit callback
 		    	    }; 				
 		    		    				
Index: lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp
===================================================================
diff -u -r9c3a64b840753192b333afb73c8fe7bdb54be638 -r69448cd1b22b367f5221efed0730303edc27404c
--- lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 9c3a64b840753192b333afb73c8fe7bdb54be638)
+++ lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 69448cd1b22b367f5221efed0730303edc27404c)
@@ -44,7 +44,7 @@
 	    			$("#feedback").val(CKEDITOR.instances.feedback.getData());
 		    			
 	    	    	var options = { 
-	    	    		target:  parent.jQuery('#questionListArea'), 
+	    	    		target:  parent.jQuery('#itemArea'), 
 	    		   		success: afterRatingSubmit  // post-submit callback
 	    		    }; 				
 		    		    				
Index: lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
===================================================================
diff -u -r9c3a64b840753192b333afb73c8fe7bdb54be638 -r69448cd1b22b367f5221efed0730303edc27404c
--- lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 9c3a64b840753192b333afb73c8fe7bdb54be638)
+++ lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 69448cd1b22b367f5221efed0730303edc27404c)
@@ -62,7 +62,7 @@
 	    			$("#feedbackOnIncorrect").val(CKEDITOR.instances.feedbackOnIncorrect.getData());
 		    			
 	    	    	var options = { 
-	    	    		target:  parent.jQuery('#questionListArea'), 
+	    	    		target:  parent.jQuery('#itemArea'), 
 	    		   		success: afterRatingSubmit  // post-submit callback
 	    		    }; 				
 		    		    				
Index: lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp
===================================================================
diff -u -r9c3a64b840753192b333afb73c8fe7bdb54be638 -r69448cd1b22b367f5221efed0730303edc27404c
--- lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision 9c3a64b840753192b333afb73c8fe7bdb54be638)
+++ lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision 69448cd1b22b367f5221efed0730303edc27404c)
@@ -92,7 +92,7 @@
 		    			$("#feedback").val(CKEDITOR.instances.feedback.getData());
 		    			
 		    	    	var options = { 
-		    	    		target:  parent.jQuery('#questionListArea'), 
+		    	    		target:  parent.jQuery('#itemArea'), 
 		    		   		success: afterRatingSubmit  // post-submit callback
 		    		    }; 				
 		    		    				
Index: lams_tool_assessment/web/pages/authoring/parts/addordering.jsp
===================================================================
diff -u -r9c3a64b840753192b333afb73c8fe7bdb54be638 -r69448cd1b22b367f5221efed0730303edc27404c
--- lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision 9c3a64b840753192b333afb73c8fe7bdb54be638)
+++ lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision 69448cd1b22b367f5221efed0730303edc27404c)
@@ -47,7 +47,7 @@
 		    			$("#feedbackOnIncorrect").val(CKEDITOR.instances.feedbackOnIncorrect.getData());
 		    			
 		    	    	var options = { 
-		    	    		target:  parent.jQuery('#questionListArea'), 
+		    	    		target:  parent.jQuery('#itemArea'), 
 		    		   		success: afterRatingSubmit  // post-submit callback
 		    		    }; 				
 		    		    				
Index: lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp
===================================================================
diff -u -r9c3a64b840753192b333afb73c8fe7bdb54be638 -r69448cd1b22b367f5221efed0730303edc27404c
--- lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision 9c3a64b840753192b333afb73c8fe7bdb54be638)
+++ lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision 69448cd1b22b367f5221efed0730303edc27404c)
@@ -54,7 +54,7 @@
 		    			$("#feedback").val(CKEDITOR.instances.feedback.getData());
 		    			
 		    	    	var options = { 
-		    	    		target:  parent.jQuery('#questionListArea'), 
+		    	    		target:  parent.jQuery('#itemArea'), 
 		    		   		success: afterRatingSubmit  // post-submit callback
 		    		    }; 				
 		    		    				
Index: lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp
===================================================================
diff -u -r9c3a64b840753192b333afb73c8fe7bdb54be638 -r69448cd1b22b367f5221efed0730303edc27404c
--- lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision 9c3a64b840753192b333afb73c8fe7bdb54be638)
+++ lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision 69448cd1b22b367f5221efed0730303edc27404c)
@@ -49,7 +49,7 @@
 		    			$("#feedbackOnIncorrect").val(CKEDITOR.instances.feedbackOnIncorrect.getData());
 		    			
 		    	    	var options = { 
-		    	    		target:  parent.jQuery('#questionListArea'), 
+		    	    		target:  parent.jQuery('#itemArea'), 
 		    		   		success: afterRatingSubmit  // post-submit callback
 		    		    }; 				
 		    		    				
Index: lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp
===================================================================
diff -u -r9c3a64b840753192b333afb73c8fe7bdb54be638 -r69448cd1b22b367f5221efed0730303edc27404c
--- lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision 9c3a64b840753192b333afb73c8fe7bdb54be638)
+++ lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision 69448cd1b22b367f5221efed0730303edc27404c)
@@ -160,21 +160,21 @@
 				<fmt:message key="label.authoring.basic.export.questions" />
 			</a>
 		</div>
-<!--		
+
 		<div class="pull-right roffset5">
 			<c:url var="tempUrl" value="">
 				<c:param name="output">
-					<c:url value='/authoring/importQbQuestion.do'/>?httpSessionID=${httpSessionID}
+					<c:url value='/authoring/importQbQuestion.do'/>?sessionMapID=${sessionMapID}
 				</c:param>
 			</c:url>
 			<c:set var="returnUrl" value="${fn:substringAfter(tempUrl, '=')}" />
 		
-			<a href="<lams:LAMSURL/>/searchQB/start.do?returnUrl=${returnUrl}&toolContentId=${sessionMap.assessmentForm.assessment.contentId}&KeepThis=true&TB_iframe=true&modal=true" 
+			<a href="<lams:LAMSURL/>/searchQB/start.do?returnUrl=${returnUrl}&toolContentId=${sessionMap.toolContentID}&KeepThis=true&TB_iframe=true&modal=true" 
 				class="btn btn-default btn-xs thickbox"> 
 				Import from question bank
 			</a>
 		</div> 
--->
+
 	</div>
 
 	<table class="table table-condensed" id="questionTable">