Index: lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
===================================================================
diff -u -rfcb79f2ce8462f39e3132b2a65f779f05b0274c7 -r9ebb0762842cde9a358626a248132bc7ca650f3c
--- lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java	(.../EditQbQuestionController.java)	(revision fcb79f2ce8462f39e3132b2a65f779f05b0274c7)
+++ lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java	(.../EditQbQuestionController.java)	(revision 9ebb0762842cde9a358626a248132bc7ca650f3c)
@@ -4,7 +4,6 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -15,26 +14,23 @@
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.qb.QbConstants;
+import org.lamsfoundation.lams.qb.QbUtils;
 import org.lamsfoundation.lams.qb.form.QbQuestionForm;
-import org.lamsfoundation.lams.qb.model.QbCollection;
 import org.lamsfoundation.lams.qb.model.QbOption;
 import org.lamsfoundation.lams.qb.model.QbQuestion;
 import org.lamsfoundation.lams.qb.model.QbQuestionUnit;
 import org.lamsfoundation.lams.qb.service.IQbService;
-import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
-import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -99,25 +95,8 @@
 	}
 	request.setAttribute(QbConstants.ATTR_UNIT_LIST, unitList);
 
-	//prepare data for displaying collections
-	Integer userId = getUserId();
-	Collection<QbCollection> userCollections = qbService.getUserCollections(userId);
-	request.setAttribute("userCollections", userCollections);
+	QbUtils.fillFormWithUserCollections(qbService, form, null);
 
-	//in case request came from assessment tool - set private collection as default, otherwise collectioUid is already supplied as parameter from collections.jsp
-	final boolean isRequestCameFromAssessmentTool = StringUtils.isNotBlank(form.getSessionMapID());
-	if (isRequestCameFromAssessmentTool) {
-	    for (QbCollection collection : userCollections) {
-		if (collection.isPersonal()) {
-		    form.setOldCollectionUid(collection.getUid());
-		    break;
-		}
-	    }
-
-	} else {
-	    form.setOldCollectionUid(collectionUid);
-	}
-
 	Integer type = NumberUtils.toInt(request.getParameter(QbConstants.ATTR_QUESTION_TYPE));
 	return findForwardByQuestionType(type);
     }
@@ -140,7 +119,7 @@
 	//TODO remove hardcoded value, once we transfer contentFolderId from old DB entries
 	form.setContentFolderID(qbQuestion.getContentFolderId() == null ? "temp" : qbQuestion.getContentFolderId());
 	form.setTitle(qbQuestion.getName());
-	form.setQuestion(qbQuestion.getDescription());
+	form.setDescription(qbQuestion.getDescription());
 	form.setMaxMark(qbQuestion.getMaxMark() == null ? 1 : qbQuestion.getMaxMark());
 	form.setPenaltyFactor(String.valueOf(qbQuestion.getPenaltyFactor()));
 	form.setAnswerRequired(qbQuestion.isAnswerRequired());
@@ -170,30 +149,9 @@
 	    List<QbQuestionUnit> unitList = qbQuestion.getUnits();
 	    request.setAttribute(QbConstants.ATTR_UNIT_LIST, unitList);
 	}
+	
+	QbUtils.fillFormWithUserCollections(qbService, form, qbQuestionUid);
 
-	//prepare data for displaying collections
-	Integer userId = getUserId();
-	Collection<QbCollection> userCollections = qbService.getUserCollections(userId);
-	request.setAttribute("userCollections", userCollections);
-	//in case request came from assessment tool - set private collection as default, otherwise collectioUid is already supplied as parameter from collections.jsp
-	final boolean isRequestCameFromAssessmentTool = StringUtils.isNotBlank(form.getSessionMapID());
-	if (isRequestCameFromAssessmentTool) {
-	    Collection<QbCollection> questionCollections = qbService.getQuestionCollectionsByUid(qbQuestionUid);
-
-	    Long collectionUid = null;
-	    if (questionCollections.isEmpty()) {
-		for (QbCollection collection : userCollections) {
-		    if (collection.isPersonal()) {
-			collectionUid = collection.getUid();
-			break;
-		    }
-		}
-	    } else {
-		collectionUid = questionCollections.iterator().next().getUid();
-	    }
-	    form.setOldCollectionUid(collectionUid);
-	}
-
 	return findForwardByQuestionType(qbQuestion.getType());
     }
 
@@ -256,7 +214,7 @@
 	    qbService.addQuestionToCollection(newCollectionUid, qbQuestion.getQuestionId(), false);
 	}
 
-	//remove from the old collection first, if needed
+	//remove from the old collection, if needed
 	if (!isAddingQuestion && IS_REQUEST_CAME_FROM_ASSESSMENT_TOOL && !newCollectionUid.equals(oldCollectionUid)) {
 	    qbService.removeQuestionFromCollectionByQuestionId(oldCollectionUid, qbQuestion.getQuestionId(), false);
 	}
@@ -311,7 +269,7 @@
 	qbService.releaseFromCache(oldQuestion);
 
 	qbQuestion.setName(form.getTitle());
-	qbQuestion.setDescription(form.getQuestion());
+	qbQuestion.setDescription(form.getDescription());
 
 	if (!form.isAuthoringRestricted()) {
 	    qbQuestion.setMaxMark(form.getMaxMark());
@@ -646,10 +604,4 @@
 	return forward;
     }
 
-    private Integer getUserId() {
-	HttpSession ss = SessionManager.getSession();
-	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-	return user != null ? user.getUserID() : null;
-    }
-
 }
Index: lams_central/web/qb/authoring/addQuestionFooter.jsp
===================================================================
diff -u -r475b1970be027a5c59a08d33ad1aa1f6b2443402 -r9ebb0762842cde9a358626a248132bc7ca650f3c
--- lams_central/web/qb/authoring/addQuestionFooter.jsp	(.../addQuestionFooter.jsp)	(revision 475b1970be027a5c59a08d33ad1aa1f6b2443402)
+++ lams_central/web/qb/authoring/addQuestionFooter.jsp	(.../addQuestionFooter.jsp)	(revision 9ebb0762842cde9a358626a248132bc7ca650f3c)
@@ -7,7 +7,7 @@
 	       		Collection
 	        		
 				<select class="btn btn-md btn-default" id="collection-uid-select">
-					<c:forEach var="collection" items="${userCollections}">
+					<c:forEach var="collection" items="${assessmentQuestionForm.userCollections}">
 						<option value="${collection.uid}"
 							<c:if test="${collection.uid == assessmentQuestionForm.oldCollectionUid}">selected="selected"</c:if>>
 							<c:out value="${collection.name}" />
Index: lams_central/web/qb/authoring/addessay.jsp
===================================================================
diff -u -r3dd671b97cfec075c59817c85c246971b46639ec -r9ebb0762842cde9a358626a248132bc7ca650f3c
--- lams_central/web/qb/authoring/addessay.jsp	(.../addessay.jsp)	(revision 3dd671b97cfec075c59817c85c246971b46639ec)
+++ lams_central/web/qb/authoring/addessay.jsp	(.../addessay.jsp)	(revision 9ebb0762842cde9a358626a248132bc7ca650f3c)
@@ -45,7 +45,7 @@
 	    			}
 	    		},
    			    submitHandler: function(form) {
-	    			$("#question").val(CKEDITOR.instances.question.getData());
+	    			$("#description").val(CKEDITOR.instances.description.getData());
 	    			$("#feedback").val(CKEDITOR.instances.feedback.getData());
 	    			$("#new-collection-uid").val($("#collection-uid-select option:selected").val());
 	     			    
@@ -145,7 +145,7 @@
 				
 					<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}" 
+						<lams:CKEditor id="description" value="${assessmentQuestionForm.description}" contentFolderID="${assessmentQuestionForm.contentFolderID}" 
 							placeholder="${QUESTION_DESCRIPTION_LABEL}"	 />
 					</div>
 				</div>
Index: lams_central/web/qb/authoring/addmarkhedging.jsp
===================================================================
diff -u -r3dd671b97cfec075c59817c85c246971b46639ec -r9ebb0762842cde9a358626a248132bc7ca650f3c
--- lams_central/web/qb/authoring/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision 3dd671b97cfec075c59817c85c246971b46639ec)
+++ lams_central/web/qb/authoring/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision 9ebb0762842cde9a358626a248132bc7ca650f3c)
@@ -38,7 +38,7 @@
      			submitHandler: function(form) {
      			   	prepareOptionEditorsForAjaxSubmit();
 		    		$("#optionList").val($("#optionForm").serialize(true));
-		    		$("#question").val(CKEDITOR.instances.question.getData());
+		    		$("#description").val(CKEDITOR.instances.description.getData());
 		    		$("#feedback").val(CKEDITOR.instances.feedback.getData());
 		    		$("#feedbackOnCorrect").val(CKEDITOR.instances.feedbackOnCorrect.getData());
 		    		$("#feedbackOnPartiallyCorrect").val(CKEDITOR.instances.feedbackOnPartiallyCorrect.getData());
@@ -109,7 +109,7 @@
 				
 					<div class="form-group">
 						<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}" 
+						<lams:CKEditor id="description" value="${assessmentQuestionForm.description}" contentFolderID="${assessmentQuestionForm.contentFolderID}" 
 							placeholder="${QUESTION_DESCRIPTION_LABEL}"	 />
 					</div>
 					
Index: lams_central/web/qb/authoring/addmatchingpairs.jsp
===================================================================
diff -u -r3dd671b97cfec075c59817c85c246971b46639ec -r9ebb0762842cde9a358626a248132bc7ca650f3c
--- lams_central/web/qb/authoring/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 3dd671b97cfec075c59817c85c246971b46639ec)
+++ lams_central/web/qb/authoring/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 9ebb0762842cde9a358626a248132bc7ca650f3c)
@@ -40,7 +40,7 @@
 	    		},
    			    submitHandler: function(form) {
 	    			$("#optionList").val($("#optionForm").serialize(true));
-	    			$("#question").val(CKEDITOR.instances.question.getData());
+	    			$("#description").val(CKEDITOR.instances.description.getData());
 	    			$("#feedback").val(CKEDITOR.instances.feedback.getData());
 	    			$("#new-collection-uid").val($("#collection-uid-select option:selected").val());
 		    			
@@ -104,7 +104,7 @@
 				
 					<div class="form-group">
 						<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}" 
+						<lams:CKEditor id="description" value="${assessmentQuestionForm.description}" contentFolderID="${assessmentQuestionForm.contentFolderID}" 
 							placeholder="${QUESTION_DESCRIPTION_LABEL}"	 />
 					</div>
 					
Index: lams_central/web/qb/authoring/addmultiplechoice.jsp
===================================================================
diff -u -r3dd671b97cfec075c59817c85c246971b46639ec -r9ebb0762842cde9a358626a248132bc7ca650f3c
--- lams_central/web/qb/authoring/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 3dd671b97cfec075c59817c85c246971b46639ec)
+++ lams_central/web/qb/authoring/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 9ebb0762842cde9a358626a248132bc7ca650f3c)
@@ -55,7 +55,7 @@
    			    submitHandler: function(form) {
    			    	prepareOptionEditorsForAjaxSubmit();
 	    			$("#optionList").val($("#optionForm").serialize(true));
-	    			$("#question").val(CKEDITOR.instances.question.getData());
+	    			$("#description").val(CKEDITOR.instances.description.getData());
 	    			$("#feedback").val(CKEDITOR.instances.feedback.getData());
 	    			$("#feedbackOnCorrect").val(CKEDITOR.instances.feedbackOnCorrect.getData());
 	    			$("#feedbackOnPartiallyCorrect").val(CKEDITOR.instances.feedbackOnPartiallyCorrect.getData());
@@ -150,7 +150,7 @@
 				
 					<div class="form-group">
 						<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}" 
+						<lams:CKEditor id="description" value="${assessmentQuestionForm.description}" contentFolderID="${assessmentQuestionForm.contentFolderID}" 
 							placeholder="${QUESTION_DESCRIPTION_LABEL}"	 />
 					</div>
 				
Index: lams_central/web/qb/authoring/addnumerical.jsp
===================================================================
diff -u -r3dd671b97cfec075c59817c85c246971b46639ec -r9ebb0762842cde9a358626a248132bc7ca650f3c
--- lams_central/web/qb/authoring/addnumerical.jsp	(.../addnumerical.jsp)	(revision 3dd671b97cfec075c59817c85c246971b46639ec)
+++ lams_central/web/qb/authoring/addnumerical.jsp	(.../addnumerical.jsp)	(revision 9ebb0762842cde9a358626a248132bc7ca650f3c)
@@ -88,7 +88,7 @@
      			    	prepareOptionEditorsForAjaxSubmit();
 		    			$("#optionList").val($("#optionForm").serialize(true));
 		    			$("#unitList").val($("#unitForm").serialize(true));
-		    			$("#question").val(CKEDITOR.instances.question.getData());
+		    			$("#description").val(CKEDITOR.instances.description.getData());
 		    			$("#feedback").val(CKEDITOR.instances.feedback.getData());
 		    			$("#new-collection-uid").val($("#collection-uid-select option:selected").val());
 		    			
@@ -162,7 +162,7 @@
 				
 					<div class="form-group">
 						<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}" 
+						<lams:CKEditor id="description" value="${assessmentQuestionForm.description}" contentFolderID="${assessmentQuestionForm.contentFolderID}" 
 							placeholder="${QUESTION_DESCRIPTION_LABEL}"	 />
 					</div>
 					
Index: lams_central/web/qb/authoring/addordering.jsp
===================================================================
diff -u -r3dd671b97cfec075c59817c85c246971b46639ec -r9ebb0762842cde9a358626a248132bc7ca650f3c
--- lams_central/web/qb/authoring/addordering.jsp	(.../addordering.jsp)	(revision 3dd671b97cfec075c59817c85c246971b46639ec)
+++ lams_central/web/qb/authoring/addordering.jsp	(.../addordering.jsp)	(revision 9ebb0762842cde9a358626a248132bc7ca650f3c)
@@ -41,7 +41,7 @@
      			    submitHandler: function(form) {
      			    	prepareOptionEditorsForAjaxSubmit();
 		    			$("#optionList").val($("#optionForm").serialize(true));
-		    			$("#question").val(CKEDITOR.instances.question.getData());
+		    			$("#description").val(CKEDITOR.instances.description.getData());
 		    			$("#feedback").val(CKEDITOR.instances.feedback.getData());
 		    			$("#feedbackOnCorrect").val(CKEDITOR.instances.feedbackOnCorrect.getData());
 		    			$("#feedbackOnIncorrect").val(CKEDITOR.instances.feedbackOnIncorrect.getData());
@@ -104,7 +104,7 @@
 				
 					<div class="form-group">
 						<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}" 
+						<lams:CKEditor id="description" value="${assessmentQuestionForm.description}" contentFolderID="${assessmentQuestionForm.contentFolderID}" 
 							placeholder="${QUESTION_DESCRIPTION_LABEL}"	 />
 					</div>
 					
Index: lams_central/web/qb/authoring/addshortanswer.jsp
===================================================================
diff -u -r3dd671b97cfec075c59817c85c246971b46639ec -r9ebb0762842cde9a358626a248132bc7ca650f3c
--- lams_central/web/qb/authoring/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision 3dd671b97cfec075c59817c85c246971b46639ec)
+++ lams_central/web/qb/authoring/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision 9ebb0762842cde9a358626a248132bc7ca650f3c)
@@ -50,7 +50,7 @@
      			    submitHandler: function(form) {
      			    	prepareOptionEditorsForAjaxSubmit();     			    
 		    			$("#optionList").val($("#optionForm").serialize(true));
-		    			$("#question").val(CKEDITOR.instances.question.getData());
+		    			$("#description").val(CKEDITOR.instances.description.getData());
 		    			$("#feedback").val(CKEDITOR.instances.feedback.getData());
 		    			$("#new-collection-uid").val($("#collection-uid-select option:selected").val());
 		    			
@@ -111,7 +111,7 @@
 				
 					<div class="form-group">
 						<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}" 
+						<lams:CKEditor id="description" value="${assessmentQuestionForm.description}" contentFolderID="${assessmentQuestionForm.contentFolderID}" 
 							placeholder="${QUESTION_DESCRIPTION_LABEL}"	 />
 					</div>
 					
Index: lams_central/web/qb/authoring/addtruefalse.jsp
===================================================================
diff -u -r3dd671b97cfec075c59817c85c246971b46639ec -r9ebb0762842cde9a358626a248132bc7ca650f3c
--- lams_central/web/qb/authoring/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision 3dd671b97cfec075c59817c85c246971b46639ec)
+++ lams_central/web/qb/authoring/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision 9ebb0762842cde9a358626a248132bc7ca650f3c)
@@ -48,7 +48,7 @@
 		    			}
 		    		},
      			    submitHandler: function(form) {
-		    			$("#question").val(CKEDITOR.instances.question.getData());
+		    			$("#description").val(CKEDITOR.instances.description.getData());
 		    			$("#feedback").val(CKEDITOR.instances.feedback.getData());
 		    			$("#feedbackOnCorrect").val(CKEDITOR.instances.feedbackOnCorrect.getData());
 		    			$("#feedbackOnIncorrect").val(CKEDITOR.instances.feedbackOnIncorrect.getData());
@@ -108,7 +108,7 @@
 				
 					<div class="form-group">
 						<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}" 
+						<lams:CKEditor id="description" value="${assessmentQuestionForm.description}" contentFolderID="${assessmentQuestionForm.contentFolderID}" 
 							placeholder="${QUESTION_DESCRIPTION_LABEL}"	 />
 					</div>
 					
Index: lams_central/web/qb/collection.jsp
===================================================================
diff -u -r2470adfeccc15e927183270be2835deea00451c7 -r9ebb0762842cde9a358626a248132bc7ca650f3c
--- lams_central/web/qb/collection.jsp	(.../collection.jsp)	(revision 2470adfeccc15e927183270be2835deea00451c7)
+++ lams_central/web/qb/collection.jsp	(.../collection.jsp)	(revision 9ebb0762842cde9a358626a248132bc7ca650f3c)
@@ -256,7 +256,7 @@
 					+ "\", \"_blank\")' title='Show stats'></i>";
 
 			cellhtml += "<a  title='<fmt:message key='label.edit' />' href='<c:url value='/qb/edit/editQuestion.do'/>?qbQuestionUid=" 
-						+ cellvalue + "&collectionUid=${collection.uid}&KeepThis=true&TB_iframe=true&modal=true' class='thickbox'>"; 
+						+ cellvalue + "&oldCollectionUid=${collection.uid}&KeepThis=true&TB_iframe=true&modal=true' class='thickbox'>"; 
 			cellhtml += 	"<i class='fa fa-pencil'></i>";
 			cellhtml += "</a>";
 
@@ -395,7 +395,7 @@
 			var questionType = document.getElementById("question-type").selectedIndex + 1;
 			$("#create-question-href").attr("href", 
 					"<c:url value='/qb/edit/initNewQuestion.do'/>?questionType=" + questionType 
-					+ "&collectionUid=${collection.uid}" 
+					+ "&oldCollectionUid=${collection.uid}" 
 					+ "&KeepThis=true&TB_iframe=true&modal=true");
 		};
 		
Index: lams_common/src/java/org/lamsfoundation/lams/qb/QbUtils.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/qb/QbUtils.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/QbUtils.java	(revision 9ebb0762842cde9a358626a248132bc7ca650f3c)
@@ -0,0 +1,54 @@
+package org.lamsfoundation.lams.qb;
+
+import java.util.Collection;
+import java.util.LinkedList;
+
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.lang.StringUtils;
+import org.lamsfoundation.lams.qb.form.QbQuestionForm;
+import org.lamsfoundation.lams.qb.model.QbCollection;
+import org.lamsfoundation.lams.qb.service.IQbService;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+
+public class QbUtils {
+    
+    public static void fillFormWithUserCollections(IQbService qbService, QbQuestionForm form, Long qbQuestionUid) {
+	//prepare data for displaying collections
+	Integer userId = getUserId();
+	Collection<QbCollection> userCollections = qbService.getUserCollections(userId);
+	form.setUserCollections(userCollections);
+	
+	//in case request came not from the tool, collectioUid is already supplied as parameter from collections.jsp
+	final boolean isRequestCameFromTool = StringUtils.isNotBlank(form.getSessionMapID());
+	if (!isRequestCameFromTool) {
+	    return;
+	}
+	    
+	Collection<QbCollection> questionCollections = qbQuestionUid == null ? new LinkedList<>()
+		: qbService.getQuestionCollectionsByUid(qbQuestionUid);
+
+	Long collectionUid = null;
+	if (questionCollections.isEmpty()) {
+	    //set private collection as default, if question is new or doesn't have associated collection
+	    for (QbCollection collection : userCollections) {
+		if (collection.isPersonal()) {
+		    collectionUid = collection.getUid();
+		    break;
+		}
+	    }
+	} else {
+	    collectionUid = questionCollections.iterator().next().getUid();
+	}
+	form.setOldCollectionUid(collectionUid);
+    }
+    
+    private static Integer getUserId() {
+	HttpSession ss = SessionManager.getSession();
+	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	return user != null ? user.getUserID() : null;
+    }
+
+}
Index: lams_common/src/java/org/lamsfoundation/lams/qb/form/QbQuestionForm.java
===================================================================
diff -u -r37e0fd07570d49c026b589611c7de693ecac9497 -r9ebb0762842cde9a358626a248132bc7ca650f3c
--- lams_common/src/java/org/lamsfoundation/lams/qb/form/QbQuestionForm.java	(.../QbQuestionForm.java)	(revision 37e0fd07570d49c026b589611c7de693ecac9497)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/form/QbQuestionForm.java	(.../QbQuestionForm.java)	(revision 9ebb0762842cde9a358626a248132bc7ca650f3c)
@@ -23,6 +23,10 @@
 
 package org.lamsfoundation.lams.qb.form;
 
+import java.util.Collection;
+
+import org.lamsfoundation.lams.qb.model.QbCollection;
+
 /**
  * QB Question Form.
  *
@@ -35,15 +39,11 @@
     private Integer questionId;
     private String sessionMapID;
     private String contentFolderID;
-    private Long oldCollectionUid;
-    private Long newCollectionUid;
-
     // tool access mode;
     private String mode;
-
     private Integer questionType;
     private String title;
-    private String question;
+    private String description;
     private int maxMark;
     private String penaltyFactor;
     private boolean answerRequired;
@@ -62,8 +62,14 @@
     private int maxWordsLimit;
     private int minWordsLimit;
     private boolean hedgingJustificationEnabled;
-
     private boolean authoringRestricted;
+    
+    private Long oldCollectionUid;
+    private Long newCollectionUid;
+    private Collection<QbCollection> userCollections;
+    
+    //used only by Scratchie and Q&A tools
+    private String itemIndex;
 
     public Long getUid() {
 	return uid;
@@ -97,22 +103,6 @@
 	this.contentFolderID = contentFolderID;
     }
 
-    public Long getOldCollectionUid() {
-	return oldCollectionUid;
-    }
-
-    public void setOldCollectionUid(Long oldCollectionUid) {
-	this.oldCollectionUid = oldCollectionUid;
-    }
-
-    public Long getNewCollectionUid() {
-	return newCollectionUid;
-    }
-
-    public void setNewCollectionUid(Long newCollectionUid) {
-	this.newCollectionUid = newCollectionUid;
-    }
-
     public String getMode() {
 	return mode;
     }
@@ -129,12 +119,12 @@
 	this.title = title;
     }
 
-    public String getQuestion() {
-	return question;
+    public String getDescription() {
+	return description;
     }
 
-    public void setQuestion(String question) {
-	this.question = question;
+    public void setDescription(String description) {
+	this.description = description;
     }
 
     public Integer getQuestionType() {
@@ -288,5 +278,37 @@
     public void setAuthoringRestricted(boolean authoringRestricted) {
 	this.authoringRestricted = authoringRestricted;
     }
+    
+    public Long getOldCollectionUid() {
+	return oldCollectionUid;
+    }
 
+    public void setOldCollectionUid(Long oldCollectionUid) {
+	this.oldCollectionUid = oldCollectionUid;
+    }
+
+    public Long getNewCollectionUid() {
+	return newCollectionUid;
+    }
+
+    public void setNewCollectionUid(Long newCollectionUid) {
+	this.newCollectionUid = newCollectionUid;
+    }
+    
+    public Collection<QbCollection> getUserCollections() {
+	return userCollections;
+    }
+
+    public void setUserCollections(Collection<QbCollection> userCollections) {
+	this.userCollections = userCollections;
+    }
+    
+    public String getItemIndex() {
+	return itemIndex;
+    }
+
+    public void setItemIndex(String itemIndex) {
+	this.itemIndex = itemIndex;
+    }
+
 }