Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.hbm.xml
===================================================================
diff -u -r9374b11565489857d973ec45bdcd8bd7ed1e5fa2 -r4939524e9374b3146f74e090c4b5204755ed4aac
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.hbm.xml	(.../ForumCondition.hbm.xml)	(revision 9374b11565489857d973ec45bdcd8bd7ed1e5fa2)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.hbm.xml	(.../ForumCondition.hbm.xml)	(revision 4939524e9374b3146f74e090c4b5204755ed4aac)
@@ -18,7 +18,7 @@
 	            table="tl_lafrum11_condition_topics"
 	            lazy="false"
 	            inverse="false"
-	            cascade="none"
+	            cascade="all"
 	            sort="unsorted"
 	            order-by="topic_uid asc"
 	            
Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaCondition.hbm.xml
===================================================================
diff -u -rfd0bf9a342a30b00387b56424ed9f97cee5babb0 -r4939524e9374b3146f74e090c4b5204755ed4aac
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaCondition.hbm.xml	(.../QaCondition.hbm.xml)	(revision fd0bf9a342a30b00387b56424ed9f97cee5babb0)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaCondition.hbm.xml	(.../QaCondition.hbm.xml)	(revision 4939524e9374b3146f74e090c4b5204755ed4aac)
@@ -18,10 +18,9 @@
 	            table="tl_laqa11_condition_questions"
 	            lazy="false"
 	            inverse="false"
-	            cascade="none"
+	            cascade="all"
 	            sort="unsorted"
 	            order-by="question_uid asc"
-	            
 	     >
 	
 	            <key
Index: lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyCondition.hbm.xml
===================================================================
diff -u -r68b9519bc829e6c9f4dd2602f64970839b1b51b8 -r4939524e9374b3146f74e090c4b5204755ed4aac
--- lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyCondition.hbm.xml	(.../SurveyCondition.hbm.xml)	(revision 68b9519bc829e6c9f4dd2602f64970839b1b51b8)
+++ lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyCondition.hbm.xml	(.../SurveyCondition.hbm.xml)	(revision 4939524e9374b3146f74e090c4b5204755ed4aac)
@@ -18,7 +18,7 @@
 	            table="tl_lasurv11_condition_questions"
 	            lazy="false"
 	            inverse="false"
-	            cascade="none"
+	            cascade="all"
 	            sort="unsorted"
 	            order-by="question_uid asc"
 	            
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyCondition.java
===================================================================
diff -u -rdce273a0c7f316a1ede9bd6a75a39190643fe51c -r4939524e9374b3146f74e090c4b5204755ed4aac
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyCondition.java	(.../SurveyCondition.java)	(revision dce273a0c7f316a1ede9bd6a75a39190643fe51c)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyCondition.java	(.../SurveyCondition.java)	(revision 4939524e9374b3146f74e090c4b5204755ed4aac)
@@ -126,7 +126,7 @@
     /**
      * Notice that questions are copied with very little information and then they are assigned to the cloned object.
      * This method is used when assigning BranchActivityEntry needs, so only basic information (in fact, only order ID)
-     * is needed. Also, there should be no link to Q&A content.
+     * is needed. Also, there should be no link to Survey content.
      */
     @Override
     public SurveyCondition clone(int uiidOffset) {