Index: lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
===================================================================
diff -u -rd709559abc2186520af2f18c3fc7417a5a598e9e -r21b12237b13026b0ff5303fd68e8bcf92d71eb73
--- lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java	(.../EditQbQuestionController.java)	(revision d709559abc2186520af2f18c3fc7417a5a598e9e)
+++ lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java	(.../EditQbQuestionController.java)	(revision 21b12237b13026b0ff5303fd68e8bcf92d71eb73)
@@ -63,7 +63,7 @@
     WebApplicationContext applicationcontext;
 
     /**
-     * Display empty page for new assessment question.
+     * Display empty page for new question.
      */
     @RequestMapping("/initNewQuestion")
     public String initNewQuestion(@ModelAttribute("assessmentQuestionForm") QbQuestionForm form,
@@ -110,10 +110,13 @@
 	if (isRequestCameFromAssessmentTool) {
 	    for (QbCollection collection : userCollections) {
 		if (collection.isPersonal()) {
-		    form.setCollectionUid(collection.getUid());
+		    form.setOldCollectionUid(collection.getUid());
 		    break;
 		}
 	    }
+	    
+	} else {
+	    form.setOldCollectionUid(collectionUid);
 	}
 
 	Integer type = NumberUtils.toInt(request.getParameter(QbConstants.ATTR_QUESTION_TYPE));
@@ -191,7 +194,7 @@
 	    } else {
 		collectionUid = questionCollections.iterator().next().getUid();
 	    }
-	    form.setCollectionUid(collectionUid);
+	    form.setOldCollectionUid(collectionUid);
 	}
 
 	return findForwardByQuestionType(qbQuestion.getType());
@@ -247,23 +250,21 @@
 	userManagementService.save(qbQuestion);
 	
 	final boolean IS_REQUEST_CAME_FROM_ASSESSMENT_TOOL = StringUtils.isNotBlank(form.getSessionMapID());
-	if (IS_REQUEST_CAME_FROM_ASSESSMENT_TOOL) {
-	    
-	    //take care about question's collections
-	    Long collectionUid = form.getCollectionUid();
-	    qbService.addQuestionToCollection(collectionUid, qbQuestion.getQuestionId(), false);
-	    //remove from the old collection, if needed
-	    if (!isAddingQuestion) {
-		Collection<QbCollection> oldQuestionCollections = qbService.getQuestionCollectionsByUid(oldQuestionUid);
-		Collection<QbCollection> newQuestionCollections = qbService
-			.getQuestionCollectionsByUid(qbQuestion.getUid());
-		oldQuestionCollections.removeAll(newQuestionCollections);
-		for (QbCollection obsoleteOldQuestionCollection : oldQuestionCollections) {
-		    qbService.removeQuestionFromCollectionByQuestionId(obsoleteOldQuestionCollection.getUid(),
-			    qbQuestion.getQuestionId());
-		}
-	    }
+
+	//take care about question's collections. add to collection first
+	Long oldCollectionUid = form.getOldCollectionUid();
+	Long newCollectionUid = form.getNewCollectionUid();
+	if (isAddingQuestion || (IS_REQUEST_CAME_FROM_ASSESSMENT_TOOL && !newCollectionUid.equals(oldCollectionUid))) {
+	    qbService.addQuestionToCollection(newCollectionUid, qbQuestion.getQuestionId(), false);
+	}
 	
+	//remove from the old collection first, if needed
+	if (!isAddingQuestion && IS_REQUEST_CAME_FROM_ASSESSMENT_TOOL && !newCollectionUid.equals(oldCollectionUid)) {
+	    qbService.removeQuestionFromCollectionByQuestionId(oldCollectionUid, qbQuestion.getQuestionId(),
+		    false);
+	}
+	
+	if (IS_REQUEST_CAME_FROM_ASSESSMENT_TOOL) {
 	    //forward to Assessment controller
 	    String params = "?qbQuestionUid=" + qbQuestion.getUid();
 	    params += "&questionModificationStatus=" + questionModificationStatus;
Index: lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
===================================================================
diff -u -r0b1e74374b821758fdda7835d8d283bf84fa8db0 -r21b12237b13026b0ff5303fd68e8bcf92d71eb73
--- lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java	(.../QbCollectionController.java)	(revision 0b1e74374b821758fdda7835d8d283bf84fa8db0)
+++ lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java	(.../QbCollectionController.java)	(revision 21b12237b13026b0ff5303fd68e8bcf92d71eb73)
@@ -186,7 +186,7 @@
     @RequestMapping("/removeCollectionQuestion")
     @ResponseBody
     public void removeCollectionQuestion(@RequestParam long collectionUid, @RequestParam int qbQuestionId) {
-	qbService.removeQuestionFromCollectionByQuestionId(collectionUid, qbQuestionId);
+	qbService.removeQuestionFromCollectionByQuestionId(collectionUid, qbQuestionId, true);
     }
 
     @RequestMapping("/addCollectionQuestion")
Index: lams_central/web/qb/authoring/addQuestionFooter.jsp
===================================================================
diff -u -r6cbd849584c40532c6be292f9f009c88cde9439c -r21b12237b13026b0ff5303fd68e8bcf92d71eb73
--- lams_central/web/qb/authoring/addQuestionFooter.jsp	(.../addQuestionFooter.jsp)	(revision 6cbd849584c40532c6be292f9f009c88cde9439c)
+++ lams_central/web/qb/authoring/addQuestionFooter.jsp	(.../addQuestionFooter.jsp)	(revision 21b12237b13026b0ff5303fd68e8bcf92d71eb73)
@@ -9,7 +9,7 @@
 				<select class="form-controlx btn btn-md btn-default" id="collection-uid-select">
 					<c:forEach var="collection" items="${userCollections}">
 						<option value="${collection.uid}"
-							<c:if test="${collection.uid == assessmentQuestionForm.collectionUid}">selected="selected"</c:if>>
+							<c:if test="${collection.uid == assessmentQuestionForm.oldCollectionUid}">selected="selected"</c:if>>
 							<c:out value="${collection.name}" />
 						</option>
 					</c:forEach>
Index: lams_central/web/qb/authoring/addessay.jsp
===================================================================
diff -u -r6cbd849584c40532c6be292f9f009c88cde9439c -r21b12237b13026b0ff5303fd68e8bcf92d71eb73
--- lams_central/web/qb/authoring/addessay.jsp	(.../addessay.jsp)	(revision 6cbd849584c40532c6be292f9f009c88cde9439c)
+++ lams_central/web/qb/authoring/addessay.jsp	(.../addessay.jsp)	(revision 21b12237b13026b0ff5303fd68e8bcf92d71eb73)
@@ -47,7 +47,7 @@
    			    submitHandler: function(form) {
 	    			$("#question").val(CKEDITOR.instances.question.getData());
 	    			$("#feedback").val(CKEDITOR.instances.feedback.getData());
-	    			$("#collection-uid-hidden").val($("#collection-uid-select option:selected").val());
+	    			$("#new-collection-uid").val($("#collection-uid-select option:selected").val());
 	     			    
 	    	    	var options = { 
 	    	    		target:  parent.jQuery('#itemArea'), 
@@ -121,7 +121,8 @@
 				<form:hidden path="sessionMapID" />
 				<form:hidden path="uid" />
 				<form:hidden path="questionType" value="6"/>
-				<form:hidden path="collectionUid" id="collection-uid-hidden"/>
+				<form:hidden path="oldCollectionUid" id="old-collection-uid"/>
+				<form:hidden path="newCollectionUid" id="new-collection-uid"/>
 
 				<button type="button" id="question-settings-link" class="btn btn-default btn-sm">
 					<fmt:message key="label.settings" />
Index: lams_central/web/qb/authoring/addmarkhedging.jsp
===================================================================
diff -u -r6cbd849584c40532c6be292f9f009c88cde9439c -r21b12237b13026b0ff5303fd68e8bcf92d71eb73
--- lams_central/web/qb/authoring/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision 6cbd849584c40532c6be292f9f009c88cde9439c)
+++ lams_central/web/qb/authoring/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision 21b12237b13026b0ff5303fd68e8bcf92d71eb73)
@@ -43,7 +43,7 @@
 		    		$("#feedbackOnCorrect").val(CKEDITOR.instances.feedbackOnCorrect.getData());
 		    		$("#feedbackOnPartiallyCorrect").val(CKEDITOR.instances.feedbackOnPartiallyCorrect.getData());
 		    		$("#feedbackOnIncorrect").val(CKEDITOR.instances.feedbackOnIncorrect.getData());
-	    			$("#collection-uid-hidden").val($("#collection-uid-select option:selected").val());
+		    		$("#new-collection-uid").val($("#collection-uid-select option:selected").val());
 		    			
 		    	   	var options = { 
 		    	   		target:  parent.jQuery('#itemArea'), 
@@ -84,7 +84,8 @@
 				<form:hidden path="uid" />
 				<input type="hidden" name="questionType" id="questionType" value="${questionType}" />
 				<input type="hidden" name="optionList" id="optionList" />
-				<form:hidden path="collectionUid" id="collection-uid-hidden"/>
+				<form:hidden path="oldCollectionUid" id="old-collection-uid"/>
+				<form:hidden path="newCollectionUid" id="new-collection-uid"/>
 				<form:hidden path="contentFolderID" id="contentFolderID"/>
 
 				<button type="button" id="question-settings-link" class="btn btn-default btn-sm">
Index: lams_central/web/qb/authoring/addmatchingpairs.jsp
===================================================================
diff -u -r6cbd849584c40532c6be292f9f009c88cde9439c -r21b12237b13026b0ff5303fd68e8bcf92d71eb73
--- lams_central/web/qb/authoring/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 6cbd849584c40532c6be292f9f009c88cde9439c)
+++ lams_central/web/qb/authoring/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 21b12237b13026b0ff5303fd68e8bcf92d71eb73)
@@ -42,7 +42,7 @@
 	    			$("#optionList").val($("#optionForm").serialize(true));
 	    			$("#question").val(CKEDITOR.instances.question.getData());
 	    			$("#feedback").val(CKEDITOR.instances.feedback.getData());
-	    			$("#collection-uid-hidden").val($("#collection-uid-select option:selected").val());
+	    			$("#new-collection-uid").val($("#collection-uid-select option:selected").val());
 		    			
 	    	    	var options = { 
 	    	    		target:  parent.jQuery('#itemArea'), 
@@ -76,7 +76,8 @@
 				<form:hidden path="uid" />
 				<input type="hidden" name="questionType" id="questionType" value="${questionType}" />
 				<input type="hidden" name="optionList" id="optionList" />
-				<form:hidden path="collectionUid" id="collection-uid-hidden"/>
+				<form:hidden path="oldCollectionUid" id="old-collection-uid"/>
+				<form:hidden path="newCollectionUid" id="new-collection-uid"/>
 				<form:hidden path="contentFolderID" id="contentFolderID"/>				
 				<form:hidden path="feedbackOnCorrect" />
 				<form:hidden path="feedbackOnPartiallyCorrect" />
Index: lams_central/web/qb/authoring/addmultiplechoice.jsp
===================================================================
diff -u -r6cbd849584c40532c6be292f9f009c88cde9439c -r21b12237b13026b0ff5303fd68e8bcf92d71eb73
--- lams_central/web/qb/authoring/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 6cbd849584c40532c6be292f9f009c88cde9439c)
+++ lams_central/web/qb/authoring/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 21b12237b13026b0ff5303fd68e8bcf92d71eb73)
@@ -60,7 +60,7 @@
 	    			$("#feedbackOnCorrect").val(CKEDITOR.instances.feedbackOnCorrect.getData());
 	    			$("#feedbackOnPartiallyCorrect").val(CKEDITOR.instances.feedbackOnPartiallyCorrect.getData());
 	    			$("#feedbackOnIncorrect").val(CKEDITOR.instances.feedbackOnIncorrect.getData());
-	    			$("#collection-uid-hidden").val($("#collection-uid-select option:selected").val());
+	    			$("#new-collection-uid").val($("#collection-uid-select option:selected").val());
 		    			
 	    	    	var options = { 
 	    	    		target:  parent.jQuery('#itemArea'), 
@@ -125,7 +125,8 @@
 				<form:hidden path="uid" />
 				<input type="hidden" name="questionType" id="questionType" value="${questionType}" />
 				<input type="hidden" name="optionList" id="optionList" />
-				<form:hidden path="collectionUid" id="collection-uid-hidden"/>
+				<form:hidden path="oldCollectionUid" id="old-collection-uid"/>
+				<form:hidden path="newCollectionUid" id="new-collection-uid"/>
 				<form:hidden path="contentFolderID" id="contentFolderID"/>
 				
 				<button type="button" id="question-settings-link" class="btn btn-default btn-sm">
Index: lams_central/web/qb/authoring/addnumerical.jsp
===================================================================
diff -u -r6cbd849584c40532c6be292f9f009c88cde9439c -r21b12237b13026b0ff5303fd68e8bcf92d71eb73
--- lams_central/web/qb/authoring/addnumerical.jsp	(.../addnumerical.jsp)	(revision 6cbd849584c40532c6be292f9f009c88cde9439c)
+++ lams_central/web/qb/authoring/addnumerical.jsp	(.../addnumerical.jsp)	(revision 21b12237b13026b0ff5303fd68e8bcf92d71eb73)
@@ -90,7 +90,7 @@
 		    			$("#unitList").val($("#unitForm").serialize(true));
 		    			$("#question").val(CKEDITOR.instances.question.getData());
 		    			$("#feedback").val(CKEDITOR.instances.feedback.getData());
-		    			$("#collection-uid-hidden").val($("#collection-uid-select option:selected").val());
+		    			$("#new-collection-uid").val($("#collection-uid-select option:selected").val());
 		    			
 		    	    	var options = { 
 		    	    		target:  parent.jQuery('#itemArea'), 
@@ -137,7 +137,8 @@
 				<input type="hidden" name="questionType" id="questionType" value="${questionType}" />
 				<input type="hidden" name="optionList" id="optionList" />
 				<input type="hidden" name="unitList" id="unitList" />
-				<form:hidden path="collectionUid" id="collection-uid-hidden"/>
+				<form:hidden path="oldCollectionUid" id="old-collection-uid"/>
+				<form:hidden path="newCollectionUid" id="new-collection-uid"/>
 				<form:hidden path="contentFolderID" id="contentFolderID"/>
 
 				<button type="button" id="question-settings-link" class="btn btn-default btn-sm">
Index: lams_central/web/qb/authoring/addordering.jsp
===================================================================
diff -u -r6cbd849584c40532c6be292f9f009c88cde9439c -r21b12237b13026b0ff5303fd68e8bcf92d71eb73
--- lams_central/web/qb/authoring/addordering.jsp	(.../addordering.jsp)	(revision 6cbd849584c40532c6be292f9f009c88cde9439c)
+++ lams_central/web/qb/authoring/addordering.jsp	(.../addordering.jsp)	(revision 21b12237b13026b0ff5303fd68e8bcf92d71eb73)
@@ -45,7 +45,7 @@
 		    			$("#feedback").val(CKEDITOR.instances.feedback.getData());
 		    			$("#feedbackOnCorrect").val(CKEDITOR.instances.feedbackOnCorrect.getData());
 		    			$("#feedbackOnIncorrect").val(CKEDITOR.instances.feedbackOnIncorrect.getData());
-     			    	$("#collection-uid-hidden").val($("#collection-uid-select option:selected").val());
+		    			$("#new-collection-uid").val($("#collection-uid-select option:selected").val());
 		    			
 		    	    	var options = { 
 		    	    		target:  parent.jQuery('#itemArea'), 
@@ -79,7 +79,8 @@
 				<form:hidden path="uid" />
 				<input type="hidden" name="questionType" id="questionType" value="${questionType}" />
 				<input type="hidden" name="optionList" id="optionList" />
-				<form:hidden path="collectionUid" id="collection-uid-hidden"/>
+				<form:hidden path="oldCollectionUid" id="old-collection-uid"/>
+				<form:hidden path="newCollectionUid" id="new-collection-uid"/>
 				<form:hidden path="contentFolderID" id="contentFolderID"/>
 
 				<button type="button" id="question-settings-link" class="btn btn-default btn-sm">
Index: lams_central/web/qb/authoring/addshortanswer.jsp
===================================================================
diff -u -r6cbd849584c40532c6be292f9f009c88cde9439c -r21b12237b13026b0ff5303fd68e8bcf92d71eb73
--- lams_central/web/qb/authoring/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision 6cbd849584c40532c6be292f9f009c88cde9439c)
+++ lams_central/web/qb/authoring/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision 21b12237b13026b0ff5303fd68e8bcf92d71eb73)
@@ -52,7 +52,7 @@
 		    			$("#optionList").val($("#optionForm").serialize(true));
 		    			$("#question").val(CKEDITOR.instances.question.getData());
 		    			$("#feedback").val(CKEDITOR.instances.feedback.getData());
-		    			$("#collection-uid-hidden").val($("#collection-uid-select option:selected").val());
+		    			$("#new-collection-uid").val($("#collection-uid-select option:selected").val());
 		    			
 		    	    	var options = { 
 		    	    		target:  parent.jQuery('#itemArea'), 
@@ -86,7 +86,8 @@
 				<form:hidden path="uid" />
 				<input type="hidden" name="questionType" id="questionType" value="${questionType}" />
 				<input type="hidden" name="optionList" id="optionList" />
-				<form:hidden path="collectionUid" id="collection-uid-hidden"/>
+				<form:hidden path="oldCollectionUid" id="old-collection-uid"/>
+				<form:hidden path="newCollectionUid" id="new-collection-uid"/>
 				<form:hidden path="contentFolderID" id="contentFolderID"/>
 
 				<button type="button" id="question-settings-link" class="btn btn-default btn-sm">
Index: lams_central/web/qb/authoring/addtruefalse.jsp
===================================================================
diff -u -r6cbd849584c40532c6be292f9f009c88cde9439c -r21b12237b13026b0ff5303fd68e8bcf92d71eb73
--- lams_central/web/qb/authoring/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision 6cbd849584c40532c6be292f9f009c88cde9439c)
+++ lams_central/web/qb/authoring/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision 21b12237b13026b0ff5303fd68e8bcf92d71eb73)
@@ -52,7 +52,7 @@
 		    			$("#feedback").val(CKEDITOR.instances.feedback.getData());
 		    			$("#feedbackOnCorrect").val(CKEDITOR.instances.feedbackOnCorrect.getData());
 		    			$("#feedbackOnIncorrect").val(CKEDITOR.instances.feedbackOnIncorrect.getData());
-		    			$("#collection-uid-hidden").val($("#collection-uid-select option:selected").val());
+		    			$("#new-collection-uid").val($("#collection-uid-select option:selected").val());
 		    			
 		    	    	var options = { 
 		    	    		target:  parent.jQuery('#itemArea'), 
@@ -84,7 +84,8 @@
 				<form:hidden path="sessionMapID" />
 				<form:hidden path="uid" />
 				<input type="hidden" name="questionType" id="questionType" value="${questionType}" />
-				<form:hidden path="collectionUid" id="collection-uid-hidden"/>
+				<form:hidden path="oldCollectionUid" id="old-collection-uid"/>
+				<form:hidden path="newCollectionUid" id="new-collection-uid"/>
 
 				<button type="button" id="question-settings-link" class="btn btn-default btn-sm">
 					<fmt:message key="label.settings" />
Index: lams_central/web/qb/searchWidget.jsp
===================================================================
diff -u -r6cbd849584c40532c6be292f9f009c88cde9439c -r21b12237b13026b0ff5303fd68e8bcf92d71eb73
--- lams_central/web/qb/searchWidget.jsp	(.../searchWidget.jsp)	(revision 6cbd849584c40532c6be292f9f009c88cde9439c)
+++ lams_central/web/qb/searchWidget.jsp	(.../searchWidget.jsp)	(revision 21b12237b13026b0ff5303fd68e8bcf92d71eb73)
@@ -181,6 +181,8 @@
 						//invoke refreshThickbox() only in case parent page has this method 
 						if (typeof self.parent.refreshThickbox === "function") {
 							self.parent.refreshThickbox();
+						} else if (typeof refreshThickbox === "function") {
+							refreshThickbox();
 						}
 
 						//show successfull notification
Index: lams_common/src/java/org/lamsfoundation/lams/qb/form/QbQuestionForm.java
===================================================================
diff -u -r6cbd849584c40532c6be292f9f009c88cde9439c -r21b12237b13026b0ff5303fd68e8bcf92d71eb73
--- lams_common/src/java/org/lamsfoundation/lams/qb/form/QbQuestionForm.java	(.../QbQuestionForm.java)	(revision 6cbd849584c40532c6be292f9f009c88cde9439c)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/form/QbQuestionForm.java	(.../QbQuestionForm.java)	(revision 21b12237b13026b0ff5303fd68e8bcf92d71eb73)
@@ -34,7 +34,8 @@
     private Long uid;
     private String sessionMapID;
     private String contentFolderID;
-    private Long collectionUid;
+    private Long oldCollectionUid;
+    private Long newCollectionUid;
 
     // tool access mode;
     private String mode;
@@ -87,14 +88,21 @@
 	this.contentFolderID = contentFolderID;
     }
     
-    public Long getCollectionUid() {
-	return collectionUid;
+    public Long getOldCollectionUid() {
+	return oldCollectionUid;
     }
 
-    public void setCollectionUid(Long collectionUid) {
-	this.collectionUid = collectionUid;
+    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;
     }
Index: lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
===================================================================
diff -u -r0b1e74374b821758fdda7835d8d283bf84fa8db0 -r21b12237b13026b0ff5303fd68e8bcf92d71eb73
--- lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java	(.../IQbService.java)	(revision 0b1e74374b821758fdda7835d8d283bf84fa8db0)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java	(.../IQbService.java)	(revision 21b12237b13026b0ff5303fd68e8bcf92d71eb73)
@@ -107,7 +107,7 @@
 
     boolean removeQuestionFromCollectionByUid(long collectionUid, long qbQuestionUid);
 
-    boolean removeQuestionFromCollectionByQuestionId(long collectionUid, int qbQuestionId);
+    boolean removeQuestionFromCollectionByQuestionId(long collectionUid, int qbQuestionId, boolean tryRemovingQuestion);
 
     Collection<Integer> removeQuestionFromCollection(long collectionUid, Collection<Integer> excludedQbQuestionIds);
 
Index: lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
===================================================================
diff -u -r0b1e74374b821758fdda7835d8d283bf84fa8db0 -r21b12237b13026b0ff5303fd68e8bcf92d71eb73
--- lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java	(.../QbService.java)	(revision 0b1e74374b821758fdda7835d8d283bf84fa8db0)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java	(.../QbService.java)	(revision 21b12237b13026b0ff5303fd68e8bcf92d71eb73)
@@ -452,11 +452,12 @@
     @Override
     public boolean removeQuestionFromCollectionByUid(long collectionUid, long qbQuestionUid) {
 	QbQuestion question = getQuestionByUid(qbQuestionUid);
-	return removeQuestionFromCollectionByQuestionId(collectionUid, question.getQuestionId());
+	return removeQuestionFromCollectionByQuestionId(collectionUid, question.getQuestionId(), true);
     }
 
     @Override
-    public boolean removeQuestionFromCollectionByQuestionId(long collectionUid, int qbQuestionId) {
+    public boolean removeQuestionFromCollectionByQuestionId(long collectionUid, int qbQuestionId,
+	    boolean tryRemovingQuestion) {
 	Collection<QbCollection> collections = getQuestionCollectionsByQuestionId(qbQuestionId);
 	int size = collections.size();
 	if (size <= 1) {
@@ -473,7 +474,7 @@
 	Collection<Integer> includedIds = qbDAO.getCollectionQuestionIdsExcluded(collectionUid, excludedQbQuestionIds);
 	Collection<Integer> retainedQuestionIds = new HashSet<>();
 	for (Integer questionId : includedIds) {
-	    boolean deleted = removeQuestionFromCollectionByQuestionId(collectionUid, questionId);
+	    boolean deleted = removeQuestionFromCollectionByQuestionId(collectionUid, questionId, true);
 	    if (!deleted) {
 		retainedQuestionIds.add(questionId);
 	    }