Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.hbm.xml
===================================================================
diff -u -rc7798d2b81a0595194a5e905ef6c33e372ad8007 -r329ca3f50cb1a0409803b0a4c8c21717bb63e60c
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.hbm.xml	(.../ForumCondition.hbm.xml)	(revision c7798d2b81a0595194a5e905ef6c33e372ad8007)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.hbm.xml	(.../ForumCondition.hbm.xml)	(revision 329ca3f50cb1a0409803b0a4c8c21717bb63e60c)
@@ -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 -rc7798d2b81a0595194a5e905ef6c33e372ad8007 -r329ca3f50cb1a0409803b0a4c8c21717bb63e60c
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaCondition.hbm.xml	(.../QaCondition.hbm.xml)	(revision c7798d2b81a0595194a5e905ef6c33e372ad8007)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaCondition.hbm.xml	(.../QaCondition.hbm.xml)	(revision 329ca3f50cb1a0409803b0a4c8c21717bb63e60c)
@@ -18,7 +18,7 @@
 	            table="tl_laqa11_condition_questions"
 	            lazy="false"
 	            inverse="false"
-	            cascade="none"
+	            cascade="all"
 	            sort="unsorted"
 	            order-by="question_uid asc"
 	            
Index: lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyCondition.hbm.xml
===================================================================
diff -u -rc7798d2b81a0595194a5e905ef6c33e372ad8007 -r329ca3f50cb1a0409803b0a4c8c21717bb63e60c
--- lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyCondition.hbm.xml	(.../SurveyCondition.hbm.xml)	(revision c7798d2b81a0595194a5e905ef6c33e372ad8007)
+++ lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyCondition.hbm.xml	(.../SurveyCondition.hbm.xml)	(revision 329ca3f50cb1a0409803b0a4c8c21717bb63e60c)
@@ -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 -r329ca3f50cb1a0409803b0a4c8c21717bb63e60c
--- 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 329ca3f50cb1a0409803b0a4c8c21717bb63e60c)
@@ -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) {