Index: lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
===================================================================
diff -u -ra2b41bfd7ae2b33847ddbc9d9c46e18b30272905 -re6624f43adec1c2405914c4111c57d95f5ab60cf
--- lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java	(.../IQbService.java)	(revision a2b41bfd7ae2b33847ddbc9d9c46e18b30272905)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java	(.../IQbService.java)	(revision e6624f43adec1c2405914c4111c57d95f5ab60cf)
@@ -103,7 +103,7 @@
 
     void unshareCollection(long collectionUid, int organisationId);
 
-    void addQuestionToCollection(long collectionUid, int qbQuestionUid, boolean copy);
+    void addQuestionToCollection(long collectionUid, int qbQuestionId, boolean copy);
 
     void addQuestionToCollection(long sourceCollectionUid, long targetCollectionUid,
 	    Collection<Integer> excludedQbQuestionIds, boolean copy);
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -r136519c454662b99974e8956475b84ac0a49bc20 -re6624f43adec1c2405914c4111c57d95f5ab60cf
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 136519c454662b99974e8956475b84ac0a49bc20)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision e6624f43adec1c2405914c4111c57d95f5ab60cf)
@@ -2644,6 +2644,8 @@
 	    }
 	    toolContentObj.setCreatedBy(user);
 
+	    long publicQbCollectionUid = qbService.getPublicCollection().getUid();
+
 	    // we need to save QB questions and options first
 	    for (AssessmentQuestion assessmentQuestion : toolContentObj.getQuestions()) {
 		QbQuestion qbQuestion = assessmentQuestion.getQbQuestion();
@@ -2681,6 +2683,8 @@
 		    qbOptions.clear();
 		}
 
+		qbService.addQuestionToCollection(publicQbCollectionUid, qbQuestion.getQuestionId(), false);
+
 		assessmentDao.insert(assessmentQuestion);
 	    }
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
===================================================================
diff -u -r45f55e8dd35ae8841dbc8db3f38a41d9d52fd2ca -re6624f43adec1c2405914c4111c57d95f5ab60cf
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(.../McService.java)	(revision 45f55e8dd35ae8841dbc8db3f38a41d9d52fd2ca)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(.../McService.java)	(revision e6624f43adec1c2405914c4111c57d95f5ab60cf)
@@ -1424,6 +1424,8 @@
 	    toolContentObj.setMcContentId(toolContentId);
 	    toolContentObj.setCreatedBy(newUserUid);
 
+	    long publicQbCollectionUid = qbService.getPublicCollection().getUid();
+
 	    // we need to save QB questions and options first
 	    for (McQueContent mcQuestion : toolContentObj.getMcQueContents()) {
 		QbQuestion qbQuestion = mcQuestion.getQbQuestion();
@@ -1441,6 +1443,8 @@
 		    mcQueContentDAO.insert(qbOption);
 		}
 		qbOptions.clear();
+
+		qbService.addQuestionToCollection(publicQbCollectionUid, qbQuestion.getQuestionId(), false);
 	    }
 
 	    mcContentDAO.saveMcContent(toolContentObj);
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
diff -u -rb765f567ba3ca9ca048b434d243d94d865ef363c -re6624f43adec1c2405914c4111c57d95f5ab60cf
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision b765f567ba3ca9ca048b434d243d94d865ef363c)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision e6624f43adec1c2405914c4111c57d95f5ab60cf)
@@ -1915,6 +1915,8 @@
 		user.setUserId(newUserUid.longValue());
 	    }
 
+	    long publicQbCollectionUid = qbService.getPublicCollection().getUid();
+
 	    // we need to save QB questions and options first
 	    for (ScratchieItem scratchieItem : toolContentObj.getScratchieItems()) {
 		QbQuestion qbQuestion = scratchieItem.getQbQuestion();
@@ -1932,9 +1934,11 @@
 		}
 		qbOptions.clear();
 
+		qbService.addQuestionToCollection(publicQbCollectionUid, qbQuestion.getQuestionId(), false);
+
 		scratchieDao.insert(scratchieItem);
 	    }
-	    
+
 	    scratchieDao.saveObject(toolContentObj);
 
 	} catch (ImportToolContentException e) {