Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.hbm.xml,v
diff -u -r1.2.2.2 -r1.2.2.3
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.hbm.xml	15 Oct 2014 07:48:44 -0000	1.2.2.2
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.hbm.xml	9 Apr 2015 12:03:04 -0000	1.2.2.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaCondition.hbm.xml,v
diff -u -r1.6.2.2 -r1.6.2.3
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaCondition.hbm.xml	15 Oct 2014 07:48:57 -0000	1.6.2.2
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaCondition.hbm.xml	9 Apr 2015 12:03:03 -0000	1.6.2.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyCondition.hbm.xml,v
diff -u -r1.2.2.2 -r1.2.2.3
--- lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyCondition.hbm.xml	15 Oct 2014 07:48:37 -0000	1.2.2.2
+++ lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyCondition.hbm.xml	9 Apr 2015 12:03:03 -0000	1.2.2.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyCondition.java,v
diff -u -r1.6 -r1.6.2.1
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyCondition.java	2 Jul 2009 08:19:23 -0000	1.6
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyCondition.java	9 Apr 2015 12:03:03 -0000	1.6.2.1
@@ -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) {