Index: lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java
===================================================================
diff -u -rd709559abc2186520af2f18c3fc7417a5a598e9e -r8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce
--- lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java	(.../SearchQBController.java)	(revision d709559abc2186520af2f18c3fc7417a5a598e9e)
+++ lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java	(.../SearchQBController.java)	(revision 8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce)
@@ -143,7 +143,6 @@
     private String getPagedQuestions(HttpServletRequest request, HttpServletResponse response) {
 	
 	Integer questionType = WebUtil.readIntParam(request, "questionType");
-//	boolean isPrivate = WebUtil.readBooleanParam(request, "isPrivate");
 
 	// Getting the params passed in from the jqGrid
 	int page = WebUtil.readIntParam(request, CommonConstants.PARAM_PAGE);
@@ -201,12 +200,4 @@
 	
 	return "qb/qbQuestionDetails";
     }
-    
-    @RequestMapping("/addQuestion")
-    private String addQuestion(HttpServletRequest request) {
-	Long questionUid = WebUtil.readLongParam(request, "questionUid");
-	Long toolContentId = WebUtil.readLongParam(request, "toolContentId");
-	
-	return "qb/";
-    }
 }
\ No newline at end of file
Index: lams_central/web/includes/javascript/qb-search.js
===================================================================
diff -u
--- lams_central/web/includes/javascript/qb-search.js	(revision 0)
+++ lams_central/web/includes/javascript/qb-search.js	(revision 8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce)
@@ -0,0 +1,44 @@
+		//auxiliary formatter for jqGrid's question column
+		function questionNameFormatter (cellvalue, options, rowObject) {
+	       	var questionDescription = rowObject[2] ? rowObject[2] : "";
+
+	       	var text = "<div class='question-title-grid'>" + cellvalue + "</div>";
+	       	text += "<div class='question-description-grid small'>";
+	       	if (questionDescription.length > 0) {
+	       		text += questionDescription;
+			}
+	        text += "</div>"
+	        	
+			return text;
+		}
+
+	    //search field handler
+	    var timeoutHnd;
+	    function doSearch(ev){
+			//	var elem = ev.target||ev.srcElement;
+	       	if(timeoutHnd)
+	       		clearTimeout(timeoutHnd)
+	       	timeoutHnd = setTimeout(gridSearch,500)
+	    }
+		function gridSearch(){
+			$("#questions-grid").jqGrid(
+				'setGridParam', {
+		           	postData: { 
+		           		questionType: $("#question-type").val(),
+			           	searchString: $("#filter-questions").val() 
+			        }
+		       	}, 
+				{ page: 1 }
+			).trigger('reloadGrid');
+
+		    $("#question-detail-area").hide("slow").html("");
+	        //jQuery("#bigset").jqGrid('setGridParam',{url:"bigset.php?nm_mask="+nm_mask+"&cd_mask="+cd_mask,page:1}).trigger("reloadGrid");
+	    }
+		
+		
+		function gridSearchHighlight () {
+	  	  	//highlight search results
+			if ($("#filter-questions").val()) {
+				$('>tbody>tr.jqgrow>td:nth-child(2)', this).highlight($("#filter-questions").val());
+			}
+		}
\ No newline at end of file
Index: lams_central/web/qb/searchWidget.jsp
===================================================================
diff -u -r21b12237b13026b0ff5303fd68e8bcf92d71eb73 -r8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce
--- lams_central/web/qb/searchWidget.jsp	(.../searchWidget.jsp)	(revision 21b12237b13026b0ff5303fd68e8bcf92d71eb73)
+++ lams_central/web/qb/searchWidget.jsp	(.../searchWidget.jsp)	(revision 8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce)
@@ -20,7 +20,6 @@
 		.question-title-grid {
 		    overflow-x: hidden;
 		}
-		
 
 		#import-button {
 			margin-left: 5px;
@@ -42,6 +41,10 @@
 			padding: 10px;
 		}
 		
+		#grid-container {
+			min-height: 300px;
+		}
+		
 		/* padding of #grid-container's two columns */
 		#grid-container > div {
 			padding: 0;
@@ -100,6 +103,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/free.jquery.jqgrid.min.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.highlight.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.blockUI.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/qb-search.js"></script>
 	<script type="text/javascript">
 		$(document).ready(function(){
 			
@@ -133,12 +137,7 @@
 			   		var questionUid = jQuery("#questions-grid").getCell(rowid, 'questionUid');
 			   		loadQuestionDetailsArea(questionUid);
 				},
-		  	  	gridComplete: function () {
-			  	  	//highlight search results
-					if ($("#filter-questions").val()) {
-						$('>tbody>tr.jqgrow>td:nth-child(2)', this).highlight($("#filter-questions").val());
-					}
-				},
+		  	  	gridComplete: gridSearchHighlight,
 			    loadError: function(xhr,textStatus,errorThrown) {
 			    	$("#questions-grid").clearGridData();
 			    	$("#question-detail-area").hide().html("");
@@ -192,43 +191,6 @@
 	        });
 		});
 
-		//auxiliary formatter for jqGrid's question column
-		function questionNameFormatter (cellvalue, options, rowObject) {
-	       	var questionDescription = rowObject[2] ? rowObject[2] : "";
-
-	       	var text = "<div class='question-title-grid'>" + cellvalue + "</div>";
-	       	text += "<div class='question-description-grid small'>";
-	       	if (questionDescription.length > 0) {
-	       		text += questionDescription;
-			}
-	        text += "</div>"
-	        	
-			return text;
-		}
-
-	    //search field handler
-	    var timeoutHnd;
-	    function doSearch(ev){
-			//	var elem = ev.target||ev.srcElement;
-	       	if(timeoutHnd)
-	       		clearTimeout(timeoutHnd)
-	       	timeoutHnd = setTimeout(gridSearch,500)
-	    }
-		function gridSearch(){
-			$("#questions-grid").jqGrid(
-				'setGridParam', {
-		           	postData: { 
-		           		questionType: $("#question-type").val(),
-			           	searchString: $("#filter-questions").val() 
-			        }
-		       	}, 
-				{ page: 1 }
-			).trigger('reloadGrid');
-
-		    $("#question-detail-area").hide("slow").html("");
-	        //jQuery("#bigset").jqGrid('setGridParam',{url:"bigset.php?nm_mask="+nm_mask+"&cd_mask="+cd_mask,page:1}).trigger("reloadGrid");
-	    }
-
 		//load up question details area
 	    function loadQuestionDetailsArea(questionUid) {
   	        $("#question-detail-area").show().load(
@@ -287,7 +249,7 @@
 				</c:if>
 			</div>
 
-			<div id="grid-container" style="min-height: 300px;">
+			<div id="grid-container">
 		 		<div class="grid-holder col-xs-12 col-sm-4">
 		 			<table id="questions-grid" class="scroll"></table>
 					<div id="questions-grid-pager" class="scroll"></div>
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
===================================================================
diff -u -rb688f852f5068e201101657aee0f735dd5998647 -r8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql	(.../patch20190110.sql)	(revision b688f852f5068e201101657aee0f735dd5998647)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql	(.../patch20190110.sql)	(revision 8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce)
@@ -602,6 +602,13 @@
 -- prepare for answer inheritance
 INSERT INTO lams_qb_tool_answer
 	SELECT uid, assessment_question_uid, submitted_option_uid FROM tl_laasse10_question_result;
+	
+-- fill content_folder_id with real values from learning designs
+UPDATE lams_qb_question AS qbque, lams_qb_tool_question AS toolque, lams_learning_activity AS activity, lams_learning_design AS design
+	SET qbque.content_folder_id = design.content_folder_id
+	WHERE qbque.uid = toolque.qb_question_uid
+		AND toolque.tool_content_id = activity.tool_content_id
+		AND activity.learning_design_id = design.learning_design_id;
 
 
 -- cleanup
Index: lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
===================================================================
diff -u -r2470adfeccc15e927183270be2835deea00451c7 -r8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce
--- lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java	(.../QbDAO.java)	(revision 2470adfeccc15e927183270be2835deea00451c7)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java	(.../QbDAO.java)	(revision 8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce)
@@ -195,7 +195,7 @@
 		+ " AND (REGEXP_REPLACE(question.description, '<[^>]*>+', '') LIKE CONCAT('%', :searchString, '%')"
 		+ " OR question.name LIKE CONCAT('%', :searchString, '%') "
 		+ " OR REGEXP_REPLACE(qboption.name, '<[^>]*>+', '') LIKE CONCAT('%', :searchString, '%')) ";
-	final String ORDER_BY_NAME = "ORDER BY question.name ";
+	final String ORDER_BY_NAME = "ORDER BY question.name, question.description ";
 	final String ORDER_BY_SMTH_ELSE = "ORDER BY question.question_id ";
 
 	//TODO check the following query with real data. and see maybe it's better than the current (it's unlikely though) [https://stackoverflow.com/a/28090544/10331386 and https://stackoverflow.com/a/612268/10331386]
Index: lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
===================================================================
diff -u -r208bc1639c1a44dc829d9f5c70d6f82ce9ceb0e0 -r8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce
--- lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java	(.../QbQuestion.java)	(revision 208bc1639c1a44dc829d9f5c70d6f82ce9ceb0e0)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java	(.../QbQuestion.java)	(revision 8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce)
@@ -304,7 +304,7 @@
     }
 
     public Integer getMaxMark() {
-	return maxMark;
+	return maxMark == null ? 1 : maxMark;
     }
 
     public void setMaxMark(Integer maxMark) {
Index: lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r5129d828c41c0731ee7889271cffde6421e2146c -r8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce
--- lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 5129d828c41c0731ee7889271cffde6421e2146c)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce)
@@ -179,7 +179,6 @@
 label.authoring.basic.question.bank.title  =Question bank
 label.authoring.basic.list.header.mark  =Mark
 label.authoring.basic.type.random.question  =Random question
-label.authoring.basic.random.question  =Question
 authoring.import.result  =Import tool content result
 authoring.title.import  =Import questions
 authoring.import.instruction  =Please choose questions to import.
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190704.sql
===================================================================
diff -u -r6cbd849584c40532c6be292f9f009c88cde9439c -r8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190704.sql	(.../patch20190704.sql)	(revision 6cbd849584c40532c6be292f9f009c88cde9439c)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190704.sql	(.../patch20190704.sql)	(revision 8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce)
@@ -3,10 +3,16 @@
 SET FOREIGN_KEY_CHECKS=0;
 ----------------------Put all sql statements below here-------------------------
 
---LDEV- remove obsolete title column
+--LDEV-4836 remove obsolete columns
 ALTER TABLE tl_laasse10_question_reference DROP COLUMN title;
 ALTER TABLE tl_laasse10_question_reference DROP COLUMN question_type;
+
+-- fill assessment_question.random_question with real values for old questions
 ALTER TABLE tl_laasse10_assessment_question ADD COLUMN random_question TINYINT(1) NOT NULL DEFAULT 0;
+UPDATE tl_laasse10_assessment_question AS asque
+SET asque.random_question = 1
+WHERE NOT EXISTS
+	(SELECT 1 FROM tl_laasse10_question_reference WHERE question_uid = asque.uid);
 
 UPDATE lams_tool SET tool_version='20190704' WHERE tool_signature='laasse10';
 
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -r5129d828c41c0731ee7889271cffde6421e2146c -r8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 5129d828c41c0731ee7889271cffde6421e2146c)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce)
@@ -439,13 +439,6 @@
     @Override
     public void releaseFromCache(Object object) {
 	assessmentDao.releaseFromCache(object);
-
-	if (object instanceof QuestionReference) {
-	    QuestionReference reference = (QuestionReference) object;
-	    if (reference.getQuestion() != null) {
-		assessmentDao.releaseFromCache(reference.getQuestion());
-	    }
-	}
     }
 
     @Override
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
===================================================================
diff -u -rd709559abc2186520af2f18c3fc7417a5a598e9e -r8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision d709559abc2186520af2f18c3fc7417a5a598e9e)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce)
@@ -31,6 +31,7 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -79,7 +80,9 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.util.HtmlUtils;
 
+import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
@@ -223,9 +226,9 @@
 	Assessment assessmentPO = service.getAssessmentByContentId(assessmentForm.getAssessment().getContentId());
 
 	//TODO **part of markrecalculation**
-//	Set<AssessmentQuestion> oldQuestions = (assessmentPO == null) ? new HashSet<>() : assessmentPO.getQuestions();
-//	Set<QuestionReference> oldReferences = (assessmentPO == null) ? new HashSet<>()
-//		: assessmentPO.getQuestionReferences();
+	Set<AssessmentQuestion> oldQuestions = (assessmentPO == null) ? new HashSet<>() : assessmentPO.getQuestions();
+	Set<QuestionReference> oldReferences = (assessmentPO == null) ? new HashSet<>()
+		: assessmentPO.getQuestionReferences();
 	
 	AssessmentUser assessmentUser = null;
 
@@ -236,15 +239,18 @@
 
 	} else {
 	    //TODO **part of markrecalculation**
-//	    // copyProperties() below sets assessmentPO items to empty collection
-//	    // but the items still exist in Hibernate cache, so we need to evict them now
-//	    for (AssessmentQuestion question : oldQuestions) {
-//		service.releaseFromCache(question);
-////		service.releaseFromCache(question.getQbQuestion());
-//	    }
-//	    for (QuestionReference reference : oldReferences) {
-//		service.releaseFromCache(reference);
-//	    }
+	    // copyProperties() below sets assessmentPO items to empty collection
+	    // but the items still exist in Hibernate cache, so we need to evict them now
+	    for (AssessmentQuestion question : oldQuestions) {
+		service.releaseFromCache(question);
+//		service.releaseFromCache(question.getQbQuestion());
+	    }
+	    for (QuestionReference reference : oldReferences) {
+		service.releaseFromCache(reference);
+		if (reference.getQuestion() != null) {
+		    service.releaseFromCache(reference.getQuestion());
+		}
+	    }
 	    assessmentPO.getQuestions().clear();
 	    
 	    Long uid = assessmentPO.getUid();
@@ -281,26 +287,23 @@
 
 	// ************************* Handle assessment questions *******************
 	List<AssessmentQuestion> newRandomQuestions = getRandomPoolQuestions(sessionMap);
-	TreeSet<AssessmentQuestion> newQuestions = new TreeSet<>(newRandomQuestions);
-	
-	for (AssessmentQuestion question : newRandomQuestions) {
-	    question.setToolContentId(assessmentPO.getContentId());
-	    //TODO check
-//	    removeNewLineCharacters(question);
-	}
-	
 	Set<QuestionReference> newReferences = updateQuestionReferencesMaxMarks(request, sessionMap, true);
+	
+	TreeSet<AssessmentQuestion> newQuestions = new TreeSet<>();
+	newQuestions.addAll(newRandomQuestions);
 	for (QuestionReference reference : newReferences) {
 	    if (!reference.isRandomQuestion()) {
 		AssessmentQuestion question = reference.getQuestion();
-		question.setToolContentId(assessmentPO.getContentId());
 		newQuestions.add(question);
 	    }	   
 	    //TODO check
 //	    removeNewLineCharacters(question);
 	}
 
-	
+	for (AssessmentQuestion question : newQuestions) {
+	    question.setToolContentId(assessmentPO.getContentId());
+	}
+
 	assessmentPO.setQuestions(newQuestions);
 	
 	//TODO **part of markrecalculation**
@@ -361,51 +364,34 @@
 	    HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 	SessionMap<String, Object> sessionMap = getSessionMap(request);
 	updateQuestionReferencesMaxMarks(request, sessionMap, false);
-	
-	
-//	request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID);
-//	questionForm.setContentFolderID(contentFolderID);
-	
 
-//	request.setAttribute("isRequestedByTool", true);
-//	request.setAttribute("contentFolderID", contentFolderID);
-	
-	
-//	questionForm.setDisplayOrder(-1);//which signifies it's a new question
-//	
-//	questionForm.setMaxMark("1");
-//	questionForm.setPenaltyFactor("0");
-//	questionForm.setAnswerRequired(true);
-	
-
 	Integer type = NumberUtils.toInt(request.getParameter(QbConstants.ATTR_QUESTION_TYPE));
 	if (type.equals(-1)) {//randomQuestion case
 	    questionForm.setUid(-1L);//which signifies it's a new question
 	    questionForm.setMaxMark(1);
 	    questionForm.setPenaltyFactor("0");
 	    questionForm.setAnswerRequired(false);
+	    
+	    request.setAttribute("poolQuestionsCount", getRandomPoolQuestions(sessionMap).size());
 	    return "pages/authoring/randomQuestion";
 	    
 	} else {
-	    //let QB controller know request comes from the tool
-//		boolean REQUEST_CAME_FROM_ASSESSMENT_TOOL = true;
-//		questionForm.setRequestCameFromAssessmentTool(REQUEST_CAME_FROM_ASSESSMENT_TOOL);
+	    // sessionMapID and questionType is already supplied as parameters
 	    boolean isAuthoringRestricted = (boolean) sessionMap.get(AssessmentConstants.ATTR_IS_AUTHORING_RESTRICTED);
-
 	    String params = "?" + AssessmentConstants.ATTR_IS_AUTHORING_RESTRICTED + "=" + isAuthoringRestricted;
-	    // sessionMapID and questionType is already supplied as parameters
 
 	    forwardToEditQbQuestionController(request, response, "/qb/edit/initNewQuestion.do", params);
 	    return null;
 	}
     }
 
     /**
-     * Display edit page for existed assessment question.
+     * Display edit page for existing assessment question.
      */
     @RequestMapping("/editQuestionReference")
-    public String editQuestionReference(HttpServletRequest request, HttpServletResponse response,
-	    @RequestParam int questionReferenceIndex) throws ServletException, IOException {
+    public String editQuestionReference(@ModelAttribute("assessmentQuestionForm") QbQuestionForm questionForm,
+	    HttpServletRequest request, HttpServletResponse response, @RequestParam int questionReferenceIndex)
+	    throws ServletException, IOException {
 	SessionMap<String, Object> sessionMap = getSessionMap(request);
 	updateQuestionReferencesMaxMarks(request, sessionMap, false);
 	
@@ -414,23 +400,18 @@
 	QuestionReference questionReference = rList.get(questionReferenceIndex);
 	
 	if (questionReference.isRandomQuestion()) {
+	    questionForm.setUid(questionReference.getUid());
+	    
+	    request.setAttribute("poolQuestionsCount", getRandomPoolQuestions(sessionMap).size());
 	    return "pages/authoring/randomQuestion";
 	    
 	} else {
-//	    QbUtils.fillFormWithQbQuestion(question.getQbQuestion(), questionForm, request);
-//	    questionForm.setDisplayOrder(question.getDisplayOrder());
-
-	    //let QB controller know request comes from the tool
-//	    boolean REQUEST_CAME_FROM_ASSESSMENT_TOOL = true;
-//	    questionForm.setRequestCameFromAssessmentTool(REQUEST_CAME_FROM_ASSESSMENT_TOOL);
-//	    questionForm.setContentFolderID(contentFolderID);
 	    boolean isAuthoringRestricted = (boolean) sessionMap.get(AssessmentConstants.ATTR_IS_AUTHORING_RESTRICTED);
-//	    questionForm.setAuthoringRestricted(isAuthoringRestricted);
 	    AssessmentQuestion question = questionReference.getQuestion();
 	    
+	    // sessionMapID and questionType is already supplied as parameters
 	    String params = "?" + AssessmentConstants.ATTR_IS_AUTHORING_RESTRICTED + "=" + isAuthoringRestricted;
 	    params += "&qbQuestionUid=" + question.getQbQuestion().getUid();
-	    // sessionMapID and questionType is already supplied as parameters
 	    
 	    forwardToEditQbQuestionController(request, response, "/qb/edit/editQuestion.do", params);
 	    return null;
@@ -457,16 +438,16 @@
      */
     @SuppressWarnings("unchecked")
     @RequestMapping("/saveOrUpdateQuestion")
-    public String saveOrUpdateQuestion(@ModelAttribute("assessmentQuestionForm") QbQuestionForm questionForm,
+    public String saveOrUpdateQuestion(@ModelAttribute("assessmentQuestionForm") QbQuestionForm form,
 	    HttpServletRequest request, @RequestParam Long qbQuestionUid, @RequestParam int questionModificationStatus) {
-	String sessionMapId = questionForm.getSessionMapID();
+	String sessionMapId = form.getSessionMapID();
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(sessionMapId);
 	SortedSet<QuestionReference> references = getQuestionReferences(sessionMap);
 	QbQuestion qbQuestion = qbService.getQuestionByUid(qbQuestionUid);
 	
 	// add
-	Long oldQbQuestionUid = questionForm.getUid();
+	Long oldQbQuestionUid = form.getUid();
 	if (oldQbQuestionUid == -1) {
 	    AssessmentQuestion assessmentQuestion = new AssessmentQuestion();
 	    assessmentQuestion.setQbQuestion(qbQuestion);
@@ -478,12 +459,12 @@
 	    reference.setQuestion(assessmentQuestion);
 	    reference.setRandomQuestion(false);
 	    // set SequenceId
-	    int maxSeq2 = 1;
+	    int maxSeq = 1;
 	    if ((references != null) && (references.size() > 0)) {
 		QuestionReference last = references.last();
-		maxSeq2 = last.getSequenceId() + 1;
+		maxSeq = last.getSequenceId() + 1;
 	    }
-	    reference.setSequenceId(maxSeq2);
+	    reference.setSequenceId(maxSeq);
 	    //set maxMark
 	    int maxMark = qbQuestion.getMaxMark() == null ? 1 : qbQuestion.getMaxMark();
 	    reference.setMaxMark(maxMark);
@@ -507,17 +488,6 @@
 		}
 	    }
 	}
-//	QbQuestion qbQuestion = assessmentQuestion.getQbQuestion();
-//	// evict everything manually as we do not use DTOs, just real entities
-//	// without eviction changes would be saved immediately into DB
-//	service.releaseFromCache(assessmentQuestion);
-//	service.releaseFromCache(qbQuestion);
-	
-
-	
-//	int isQbQuestionModified = QbUtils.extractFormToQbQuestion(qbQuestion, questionForm, request, qbService,
-//		isAuthoringRestricted);
-//	assessmentQuestion.setQbQuestionModified(isQbQuestionModified);
 	request.setAttribute("qbQuestionModified", questionModificationStatus);
 
 	// set session map ID so that questionlist.jsp can get sessionMAP
@@ -533,6 +503,44 @@
     }
     
     /**
+     * Adds random QuestionReference into reference list.
+     */
+    @SuppressWarnings("unchecked")
+    @RequestMapping(value = "/saveOrUpdateRandomQuestion", method = RequestMethod.POST)
+    private String saveOrUpdateRandomQuestion(@ModelAttribute("assessmentQuestionForm") QbQuestionForm form,
+	    HttpServletRequest request) {
+	String sessionMapID = WebUtil.readStrParam(request, AssessmentConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(sessionMapID);
+	SortedSet<QuestionReference> references = getQuestionReferences(sessionMap);
+	
+	// add
+	Long referenceUid = form.getUid();
+	if (referenceUid == -1) {
+	    //create new QuestionReference
+	    QuestionReference reference = new QuestionReference();
+	    reference.setRandomQuestion(true);
+	    // set sequenceId
+	    int maxSeq = 1;
+	    if ((references != null) && (references.size() > 0)) {
+		QuestionReference last = references.last();
+		maxSeq = last.getSequenceId() + 1;
+	    }
+	    reference.setSequenceId(maxSeq);
+	    reference.setMaxMark(1);
+	    references.add(reference);
+	    
+	// edit
+	} else {
+	    //do nothing
+	}
+
+	// set session map ID so that itemlist.jsp can get sessionMAP
+	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+	return "pages/authoring/parts/questionlist";
+    }
+    
+    /**
      * QB callback handler which adds selected QbQuestion into question list.
      */
     @SuppressWarnings("unchecked")
@@ -574,52 +582,6 @@
 	return "pages/authoring/parts/questionlist";
     }
 
-//    /**
-//     * Remove assessment question from HttpSession list and update page display. As authoring rule, all persist only
-//     * happen when user submit whole page. So this remove is just impact HttpSession values.
-//     */
-//    @RequestMapping("/addQuestionReference")
-//    public String addQuestionReference(HttpServletRequest request, @RequestParam int questionIndex) {
-//	SessionMap<String, Object> sessionMap = getSessionMap(request);
-//	updateQuestionReferencesMaxMarks(request, sessionMap, false);
-//
-//	SortedSet<QuestionReference> references = getQuestionReferences(sessionMap);
-//
-//	// set SequenceId
-//	QuestionReference reference = new QuestionReference();
-//	int maxSeq = 1;
-//	if ((references != null) && (references.size() > 0)) {
-//	    QuestionReference last = references.last();
-//	    maxSeq = last.getSequenceId() + 1;
-//	}
-//	reference.setSequenceId(maxSeq);
-//
-//	// set isRandomQuestion
-//	boolean isRandomQuestion = (questionIndex == -1);
-//	reference.setRandomQuestion(isRandomQuestion);
-//
-//	if (isRandomQuestion) {
-//	    reference.setMaxMark(1);
-//	    
-//	} else {
-//	    SortedSet<AssessmentQuestion> questionList = getQuestionList(sessionMap);
-//	    AssessmentQuestion question = null;
-//	    for (AssessmentQuestion questionFromList : questionList) {
-//		if (questionFromList.getDisplayOrder() == questionIndex) {
-//		    question = questionFromList;
-//		    break;
-//		}
-//	    }
-//	    reference.setQuestion(question);
-//
-//	    int maxMark = question.getQbQuestion().getMaxMark() == null ? 1 : question.getQbQuestion().getMaxMark(); 
-//	    reference.setMaxMark(maxMark);
-//	}
-//	references.add(reference);
-//
-//	return "pages/authoring/parts/questionlist";
-//    }
-
     /**
      * Remove assessment question from HttpSession list and update page display. As authoring rule, all persist only
      * happen when user submit whole page. So this remove is just impact HttpSession values.
@@ -696,43 +658,133 @@
 	}
     }
     
-    @RequestMapping("/addToRandomPool")
+    @RequestMapping("/toggleBelongToRandomPool")
     @ResponseBody
-    public String addToRandomPool(HttpServletRequest request, HttpServletResponse response,
-	    @RequestParam Long qbQuestionUid) {
+    public String toggleBelongToRandomPool(HttpServletRequest request, HttpServletResponse response,
+	    @RequestParam Long qbQuestionUid, @RequestParam boolean requestedToAdd) {
 	SessionMap<String, Object> sessionMap = getSessionMap(request);
+	List<AssessmentQuestion> randomPoolQuestions = getRandomPoolQuestions(sessionMap);
 	QbQuestion qbQuestion = qbService.getQuestionByUid(qbQuestionUid);
 	
-	AssessmentQuestion assessmentQuestion = new AssessmentQuestion();
-	assessmentQuestion.setQbQuestion(qbQuestion);
-	assessmentQuestion.setRandomQuestion(true);
-	assessmentQuestion.setDisplayOrder(getNextDisplayOrder(sessionMap));
-	
+	if (requestedToAdd) {
+	    AssessmentQuestion assessmentQuestion = new AssessmentQuestion();
+	    assessmentQuestion.setQbQuestion(qbQuestion);
+	    assessmentQuestion.setRandomQuestion(true);
+	    assessmentQuestion.setDisplayOrder(getNextDisplayOrder(sessionMap));
+	    randomPoolQuestions.add(assessmentQuestion);
+	    
+	} else {
+	    for (AssessmentQuestion randomPoolQuestion : randomPoolQuestions) {
+		if (qbQuestionUid.equals(randomPoolQuestion.getQbQuestion().getUid())) {
+		    randomPoolQuestions.remove(randomPoolQuestion);
+
+		    // add to delList
+		    List<AssessmentQuestion> deletedRandomPoolQuestions = getDeletedRandomPoolQuestions(sessionMap);
+		    deletedRandomPoolQuestions.add(randomPoolQuestion);
+		    break;
+		}
+	    }	    
+	}
+
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
+	responseJSON.put("poolQuestionsCount", randomPoolQuestions.size());
+	response.setContentType("application/json;charset=utf-8");
+	return responseJSON.toString();
+    }
+    
+    @RequestMapping("/addAllQuestionsToRandomPool")
+    @ResponseBody
+    public String addAllQuestionsToRandomPool(HttpServletRequest request, HttpServletResponse response,
+	    @RequestParam Long qbQuestionUid, @RequestParam boolean requestedToAdd) {
+	SessionMap<String, Object> sessionMap = getSessionMap(request);
 	List<AssessmentQuestion> randomPoolQuestions = getRandomPoolQuestions(sessionMap);
-	randomPoolQuestions.add(assessmentQuestion);
+	QbQuestion qbQuestion = qbService.getQuestionByUid(qbQuestionUid);
+	
+	if (requestedToAdd) {
+	    AssessmentQuestion assessmentQuestion = new AssessmentQuestion();
+	    assessmentQuestion.setQbQuestion(qbQuestion);
+	    assessmentQuestion.setRandomQuestion(true);
+	    assessmentQuestion.setDisplayOrder(getNextDisplayOrder(sessionMap));
+	    randomPoolQuestions.add(assessmentQuestion);
+	    
+	} else {
+	    for (AssessmentQuestion randomPoolQuestion : randomPoolQuestions) {
+		if (qbQuestionUid.equals(randomPoolQuestion.getQbQuestion().getUid())) {
+		    randomPoolQuestions.remove(randomPoolQuestion);
 
+		    // add to delList
+		    List<AssessmentQuestion> deletedRandomPoolQuestions = getDeletedRandomPoolQuestions(sessionMap);
+		    deletedRandomPoolQuestions.add(randomPoolQuestion);
+		    break;
+		}
+	    }	    
+	}
+
 	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
 	responseJSON.put("isDone", true);
 	response.setContentType("application/json;charset=utf-8");
 	return responseJSON.toString();
     }
     
-    @RequestMapping("/removeFromRandomPool")
+    @RequestMapping("/getPagedRandomQuestions")
     @ResponseBody
-    public void removeFromRandomPool(HttpServletRequest request, HttpServletResponse response,
-	    @RequestParam Long qbQuestionUid) {
+    private String getPagedRandomQuestions(HttpServletRequest request, HttpServletResponse response) {
 	SessionMap<String, Object> sessionMap = getSessionMap(request);
-	
 	List<AssessmentQuestion> randomPoolQuestions = getRandomPoolQuestions(sessionMap);
-	for (AssessmentQuestion randomPoolQuestion : randomPoolQuestions) {
-	    if (qbQuestionUid.equals(randomPoolQuestion.getQbQuestion().getUid())) {
-		randomPoolQuestions.remove(randomPoolQuestion);
-		
-		// add to delList
-		List<AssessmentQuestion> deletedRandomPoolQuestions = getDeletedRandomPoolQuestions(sessionMap);
-		deletedRandomPoolQuestions.add(randomPoolQuestion);
+	Integer questionType = 1;
+
+	// Getting the params passed in from the jqGrid
+	int page = WebUtil.readIntParam(request, CommonConstants.PARAM_PAGE);
+	int rowLimit = WebUtil.readIntParam(request, CommonConstants.PARAM_ROWS);
+	String sortOrder = WebUtil.readStrParam(request, CommonConstants.PARAM_SORD);
+	String sortBy = WebUtil.readStrParam(request, CommonConstants.PARAM_SIDX, true);
+	if (StringUtils.isEmpty(sortBy)) {
+	    sortBy = "name";//"smth_else";
+	}
+	String searchString = WebUtil.readStrParam(request, "searchString", true);
+
+	// Get the user list from the db
+	List<QbQuestion> questions = qbService.getPagedQuestions(questionType, page - 1, rowLimit, sortBy, sortOrder,
+		searchString);
+	int countQuestions = qbService.getCountQuestions(questionType, searchString);
+	int totalPages = Double.valueOf(Math.ceil(Double.valueOf(countQuestions) / Double.valueOf(rowLimit)))
+		.intValue();
+
+	ArrayNode rows = JsonNodeFactory.instance.arrayNode();
+	int i = 1;
+	for (QbQuestion question : questions) {
+	    ArrayNode questionData = JsonNodeFactory.instance.arrayNode();
+	    questionData.add(question.getUid());
+	    
+	    boolean belongsToRandomPool = false;
+	    for (AssessmentQuestion randomPoolQuestion: randomPoolQuestions) {
+		if (question.getUid().equals(randomPoolQuestion.getQbQuestion().getUid())) {
+		    belongsToRandomPool = true;
+		    break;
+		}
 	    }
+	    questionData.add(belongsToRandomPool);
+	    
+	    String title = question.getName() == null ? "" : question.getName().replaceAll("\\<.*?\\>", "").replaceAll("\\n", " ").trim();
+	    questionData.add(HtmlUtils.htmlEscape(title));
+	    String description = question.getDescription() == null ? "" : question.getDescription().replaceAll("\\<.*?\\>", "").trim();
+	    questionData.add(HtmlUtils.htmlEscape(description));
+
+	    ObjectNode userRow = JsonNodeFactory.instance.objectNode();
+	    userRow.put("id", i++);
+	    userRow.set("cell", questionData);
+
+	    rows.add(userRow);
 	}
+
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
+	responseJSON.put("total", totalPages);
+	responseJSON.put("page", page);
+	responseJSON.put("records", countQuestions);
+	responseJSON.set("rows", rows);
+
+	response.setContentType("application/json;charset=utf-8");
+	return responseJSON.toString();
     }
 
     /**
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
===================================================================
diff -u -r394f403c289f0fd7808c228840bead5c4e7d5d32 -r8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision 394f403c289f0fd7808c228840bead5c4e7d5d32)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision 8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce)
@@ -193,29 +193,30 @@
 	Set<QuestionReference> questionReferences = new TreeSet<>(new SequencableComparator());
 	questionReferences.addAll(assessment.getQuestionReferences());
 	HashMap<Long, AssessmentQuestion> questionToReferenceMap = new HashMap<>();
-	ArrayList<AssessmentQuestion> takenQuestion = new ArrayList<>();
-
-	//add non-random questions
+	
+	// init random pool questions
+	List<AssessmentQuestion> availableRandomQuestions = new ArrayList<>();
+	for (AssessmentQuestion question : assessment.getQuestions()) {
+	    if (question.isRandomQuestion()) {
+		availableRandomQuestions.add(question);
+	    }
+	}
+	
 	for (QuestionReference questionReference : questionReferences) {
+	    //add non-random questions
 	    if (!questionReference.isRandomQuestion()) {
 		AssessmentQuestion question = questionReference.getQuestion();
-		takenQuestion.add(question);
 		questionToReferenceMap.put(questionReference.getUid(), question);
 	    }
-	}
-
-	Set<AssessmentQuestion> allQuestions = assessment.getQuestions();
-	Collection<AssessmentQuestion> availableQuestions = CollectionUtils.subtract(allQuestions, takenQuestion);
-	//add random questions (actually replacing them with real ones)
-	for (QuestionReference questionReference : questionReferences) {
+	    
+	    //add random questions (actually replacing them with real ones)
 	    if (questionReference.isRandomQuestion()) {
 		//pick a random element
 		Random rand = new Random(System.currentTimeMillis());
-		AssessmentQuestion question = (AssessmentQuestion) availableQuestions.toArray()[rand
-			.nextInt(availableQuestions.size())];
-		takenQuestion.add(question);
+		AssessmentQuestion question = (AssessmentQuestion) availableRandomQuestions.toArray()[rand
+			.nextInt(availableRandomQuestions.size())];
 		questionToReferenceMap.put(questionReference.getUid(), question);
-		availableQuestions.remove(question);
+		availableRandomQuestions.remove(question);
 	    }
 	}
 
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java
===================================================================
diff -u -r4353f26f9509808acdf41d0deef6cf5fd458a2b7 -r8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java	(.../AssessmentForm.java)	(revision 4353f26f9509808acdf41d0deef6cf5fd458a2b7)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java	(.../AssessmentForm.java)	(revision 8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce)
@@ -52,10 +52,6 @@
 
     public void setAssessment(Assessment assessment) {
 	this.assessment = assessment;
-	// set Form special varaible from given forum
-	if (assessment == null) {
-	    logger.error("Initial AssessmentForum failed by null value of Assessment.");
-	}
     }
 
     public void reset(HttpServletRequest request) {
Index: lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp
===================================================================
diff -u -r6cbd849584c40532c6be292f9f009c88cde9439c -r8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce
--- lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision 6cbd849584c40532c6be292f9f009c88cde9439c)
+++ lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision 8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce)
@@ -41,16 +41,18 @@
 				<td>
 					<c:choose>
 						<c:when test="${questionReference.randomQuestion}">
-							<fmt:message key="label.authoring.basic.random.question" />
+							<fmt:message key="label.authoring.basic.type.random.question" />
 						</c:when>
 						<c:otherwise>
 							<c:out value="${question.qbQuestion.name}" escapeXml="true"/>
 						</c:otherwise>
 					</c:choose>
 					
-			        <span class='pull-right alert-info btn-xs loffset5 roffset5'>
-			       		v.&nbsp;${question.qbQuestion.version}
-			        </span>
+					<c:if test="${!questionReference.randomQuestion}">
+				        <span class='pull-right alert-info btn-xs loffset5 roffset5'>
+				       		v.&nbsp;${question.qbQuestion.version}
+				        </span>
+			        </c:if>
 			        
 			       	<span class='pull-right alert-info btn-xs'>
 						<c:choose>
Index: lams_tool_assessment/web/pages/authoring/parts/questionlistRestricted.jsp
===================================================================
diff -u -r6cbd849584c40532c6be292f9f009c88cde9439c -r8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce
--- lams_tool_assessment/web/pages/authoring/parts/questionlistRestricted.jsp	(.../questionlistRestricted.jsp)	(revision 6cbd849584c40532c6be292f9f009c88cde9439c)
+++ lams_tool_assessment/web/pages/authoring/parts/questionlistRestricted.jsp	(.../questionlistRestricted.jsp)	(revision 8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce)
@@ -18,16 +18,18 @@
 				<td>
 					<c:choose>
 						<c:when test="${questionReference.randomQuestion}">
-							<fmt:message key="label.authoring.basic.random.question" />
+							<fmt:message key="label.authoring.basic.type.random.question" />
 						</c:when>
 						<c:otherwise>
 							<c:out value="${question.qbQuestion.name}" escapeXml="true"/>
 						</c:otherwise>
 					</c:choose>
 					
-			        <span class='pull-right alert-info btn-xs loffset5 roffset5'>
-			       		v.&nbsp;${question.qbQuestion.version}
-			        </span>
+					<c:if test="${!questionReference.randomQuestion}">
+				        <span class='pull-right alert-info btn-xs loffset5 roffset5'>
+				       		v.&nbsp;${question.qbQuestion.version}
+				        </span>
+			        </c:if>
 			        
 			       	<span class='pull-right alert-info btn-xs'>
 						<c:choose>
Index: lams_tool_assessment/web/pages/authoring/randomQuestion.jsp
===================================================================
diff -u -r6cbd849584c40532c6be292f9f009c88cde9439c -r8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce
--- lams_tool_assessment/web/pages/authoring/randomQuestion.jsp	(.../randomQuestion.jsp)	(revision 6cbd849584c40532c6be292f9f009c88cde9439c)
+++ lams_tool_assessment/web/pages/authoring/randomQuestion.jsp	(.../randomQuestion.jsp)	(revision 8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce)
@@ -5,8 +5,14 @@
 <lams:head>
 	<lams:css />
 	<link href="<lams:LAMSURL/>tool/laasse10/includes/css/assessment.css" rel="stylesheet" type="text/css">
-	<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css">
 	<link href="<lams:LAMSURL/>css/qb-question.css" rel="stylesheet" type="text/css">
+	<link type="text/css" href="<lams:LAMSURL/>css/free.ui.jqgrid.min.css" rel="stylesheet">
+	<link type="text/css" href="<lams:LAMSURL />gradebook/includes/css/gradebook.css" rel="stylesheet" />
+	<style>
+		#filter-questions {
+			margin-bottom: 3px;
+		}
+	</style>
 
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/common.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
@@ -20,34 +26,15 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
-    <script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/free.jquery.jqgrid.min.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.highlight.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.blockUI.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/qb-search.js"></script>
+    <script  type="text/javascript">
 		$(document).ready(function(){
 		    $("#assessmentQuestionForm").validate({
 		    	ignore: 'hidden',
-		    	rules: {
-		    		title: "required",
-		    		maxMark: {
-		    			required: true,
-		    		    digits: true
-		    		},
-		    		maxWordsLimit: {
-		    		    digits: true
-		    		},
-		    		minWordsLimit: {
-		    		    digits: true
-		    		}
-		    	},
-	    		messages: {
-	    			title: "<fmt:message key='label.authoring.choice.field.required'/>",
-	    			maxMark: {
-	    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
-	    				digits: "<fmt:message key='label.authoring.choice.enter.integer'/>"
-	    			}
-	    		},
    			    submitHandler: function(form) {
-	    			$("#question").val(CKEDITOR.instances.question.getData());
-	    			$("#feedback").val(CKEDITOR.instances.feedback.getData());
-	     			    
 	    	    	var options = { 
 	    	    		target:  parent.jQuery('#itemArea'), 
 	    		   		success: afterRatingSubmit  // post-submit callback
@@ -62,8 +49,87 @@
 				highlight: formValidationHighlight,
 				unhighlight: formValidationUnhighlight
 		  	});
+			
+			jQuery("#questions-grid").jqGrid({
+			   	//multiselect: false,
+				datatype: "json",
+				url: "<c:url value="/authoring/getPagedRandomQuestions.do"/>",
+				postData: { 
+					sessionMapID:$("#sessionMapID").val(),
+	           		collectionUids: "" 
+		        },
+				height: '100%',
+				autowidth: true,
+				shrinkToFit: true,
+			    pager: 'questions-grid-pager',
+			    rowList:[10,20,30,40,50,100],
+			    rowNum:10,
+			    guiStyle: "bootstrap",
+				iconSet: 'fontAwesome',
+			   	colNames:[
+				   	'questionUid',
+				   	'',
+					'<fmt:message key="label.authoring.basic.list.header.question"/>',
+					'questionDescription'
+				],
+			   	colModel:[
+			   		{name:'questionUid', index:'questionUid', width:0, hidden: true},
+			   		{name: 'belongsToRandomPool', index: 'belongsToRandomPool', width:20, editable:true, edittype:'checkbox', editoptions: {value:"True:False"}, 
+						formatter: "checkbox", formatoptions: {disabled : false}, sortable:false, search: false},
+			   		{name:'questionName', index:'questionName', width:570, search: true, searchoptions: { clearSearch: false }, formatter:questionNameFormatter},
+			   		{name:'questionDescription', index:'questionDescription', width:0, hidden: true}
+			   	],
+		  	  	gridComplete: gridSearchHighlight,
+			   	loadComplete: function() {
+					// storing belongToRandomPool change to DB
+				    $(":checkbox").on("click", function(event){
+					    var checkbox = $(this);
+					    
+					    var rowid = $(this).parent().parent().prop('id');
+					    var qbQuestionUid = $("#questions-grid").getCell(rowid, 'questionUid');
+						$.ajax({ 
+					 	    url: '<c:url value="/authoring/toggleBelongToRandomPool.do"/>',
+						    type: 'POST',
+							data: {
+								sessionMapID: $("#sessionMapID").val(),
+								qbQuestionUid: qbQuestionUid,
+								requestedToAdd: this.checked
+							}, 
+							function() {
+							}
+						}).done(function(data) { 
+						    //postsjson = $.parseJSON(posts);
+							$("#count-selected-questions").text(data.poolQuestionsCount);
+						    
+							//show successfull notification
+							var notification = checkbox.is(":checked") ? "Added question to the random pool" : "Removed question from the random pool";
+		                	$.growlUI('<i class="fa fa-lg fa-download"></i> ' + notification);
+
+						});
+				    	
+				    });
+			   	},
+			    loadError: function(xhr,textStatus,errorThrown) {
+			    	$("#questions-grid").clearGridData();
+			    	//display warning message
+			    	$(this).jqGrid("displayErrorMessage", "<fmt:message key="error.loaderror"/>");
+			    }
+			})
+			.navGrid("#questions-grid-pager", {edit:false,add:false,del:false,search:false});	
+
+	        //jqgrid autowidth
+	        $(window).bind('resize', function() {
+	            resizeJqgrid($(".ui-jqgrid-btable:visible"));
+	        });
+	    	function resizeJqgrid(jqgrids) {
+	    		jqgrids.each(function(index) {
+	    			var gridId = $(this).attr('id');
+	    	    	var gridParentWidth = jQuery('#gbox_' + gridId).parent().width();
+	    	    	jQuery('#' + gridId).setGridWidth(gridParentWidth, true);
+	    	    });
+	    	};
 		});
-  	</script>
+	</script>
 </lams:head>
 	
 <body>
@@ -73,39 +139,36 @@
 		</div>
 			
 		<div class="panel-body">
+		
+			<h5 style="margin-top: 0px;">
+				Select pool of random questions.
+			</h5>
 			
-			<form:form action="/lams/qb/edit/saveOrUpdateQuestion.do" modelAttribute="assessmentQuestionForm" id="assessmentQuestionForm" 
+			<form:form action="saveOrUpdateRandomQuestion.do" modelAttribute="assessmentQuestionForm" id="assessmentQuestionForm" 
 				method="post" autocomplete="off">
-				<form:hidden path="authoringRestricted"/>
-				<form:hidden path="sessionMapID" />
+				<form:hidden path="sessionMapID" id="sessionMapID"/>
 				<form:hidden path="uid" />
 				<form:hidden path="questionType" value="-1"/>
-				
-				<div class="question-tab">
-					<lams:errors/>
-					 <div class="error">
-				    	<lams:Alert id="errorMessages" type="danger" close="false" >
-							<span></span>
-						</lams:Alert>	
-				    </div>
-					
-					<!-- 
-					<div id="title-container" class="form-group">
-						<c:set var="TITLE_LABEL"><fmt:message key="label.enter.question.title"/> </c:set>
-					    <form:input path="title" id="title" cssClass="form-control borderless-text-input" tabindex="1" maxlength="255" 
-					    	placeholder="${TITLE_LABEL}"/>
-					</div>
-				
-					<div class="form-group form-group-cke">
-						<c:set var="QUESTION_DESCRIPTION_LABEL"><fmt:message key="label.enter.question.description"/></c:set>
-						<lams:CKEditor id="question" value="${assessmentQuestionForm.question}" contentFolderID="${assessmentQuestionForm.contentFolderID}" 
-							placeholder="${QUESTION_DESCRIPTION_LABEL}"	 />
-					</div>
-					 -->
-				</div>
-					
 			</form:form>
+			
+			<div id="search-widgets" class="input-group-sm">
+				<input type="text" id="filter-questions" class="form-control" placeholder="Contains text" 
+					onkeydown="doSearch(arguments[0]||event)" />
+			</div>
 
+			<div id="grid-container" style="min-height: 300px;">
+		 		<div class="grid-holder">
+		 			<table id="questions-grid" class="scroll"></table>
+					<div id="questions-grid-pager" class="scroll"></div>
+				</div>
+			</div>
+			
+			<div class="voffset10">
+				<span class="alert-warning">
+					Pool consists of <span id="count-selected-questions">${poolQuestionsCount}</span> question(s).
+				</span>
+			</div>
+
 		</div>		
 	</div>	
 	
@@ -116,7 +179,7 @@
 					<fmt:message key="label.cancel" />
 				</a>
 				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
-					<fmt:message key="button.save" />
+					<fmt:message key="label.authoring.save.button" />
 				</a>
 			</div>
       	</div>