Index: lams_build/lib/lams/lams-central.jar
===================================================================
diff -u -r134b8c6ce9847926aab1420c5adfe0a15b2c78cd -rc70c4cfe5be79e0627c85cef134184260b0a72c2
Binary files differ
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r7b79396263b36a933d66390fb9ab12821956d59d -rc70c4cfe5be79e0627c85cef134184260b0a72c2
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
===================================================================
diff -u -r542b83631b403e37429fce3bb928f2800c5cd9b8 -rc70c4cfe5be79e0627c85cef134184260b0a72c2
--- lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java	(.../ObjectExtractor.java)	(revision 542b83631b403e37429fce3bb928f2800c5cd9b8)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java	(.../ObjectExtractor.java)	(revision c70c4cfe5be79e0627c85cef134184260b0a72c2)
@@ -1800,21 +1800,21 @@
 
 	    if (BranchCondition.OUTPUT_TYPE_COMPLEX.equals(conditionType)
 		    || BranchCondition.OUTPUT_TYPE_STRING.equals(conditionType)) {
-		if (condition == null) {
-		    // This is different than "conditionID" !!!
-		    Long newConditionID = WDDXProcessor.convertToLong(conditionTable, "conditionId");
-		    BranchCondition originalCondition = branchActivityEntryDAO.getConditionByID(newConditionID);
-		    if (originalCondition == null) {
-			log.error("Could not find condition with given ID: " + conditionID);
-		    } else {
+		// This is different than "conditionID" !!!
+		Long newConditionID = condition == null ? WDDXProcessor.convertToLong(conditionTable, "conditionId")
+			: condition.getConditionId();
+		// we need to get the proper subclass, since the one provided by branch entry is not valid
+		BranchCondition originalCondition = branchActivityEntryDAO.getConditionByID(newConditionID);
+		if (originalCondition == null) {
+		    log.error("Could not find condition with given ID: " + conditionID);
+		} else {
+		    if (condition == null) {
 			condition = (BranchCondition) originalCondition.clone();
-			condition.setConditionUIID(conditionUIID);
+		    } else {
+			condition = originalCondition;
 		    }
-		}
-		else {
 		    condition.setConditionUIID(conditionUIID);
 		}
-		
 	    } else if (condition == null) {
 		condition = new BranchCondition(null, conditionUIID, WDDXProcessor.convertToInteger(conditionTable,
 			WDDXTAGS.ORDER_ID), WDDXProcessor.convertToString(conditionTable, WDDXTAGS.CONDITION_NAME),
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
diff -u -r7b79396263b36a933d66390fb9ab12821956d59d -rc70c4cfe5be79e0627c85cef134184260b0a72c2
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 7b79396263b36a933d66390fb9ab12821956d59d)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision c70c4cfe5be79e0627c85cef134184260b0a72c2)
@@ -86,21 +86,10 @@
 				
 				<!-- Mapping files for tools with complex conditions -->
 				
-				<value>classpath*:org/lamsfoundation/lams/tool/qa/*.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/notebook/model/Notebook.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/notebook/model/NotebookSession.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/notebook/model/NotebookUser.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/tool/notebook/model/NotebookAttachment.hbm.xml</value> 
-				<value>classpath:org/lamsfoundation/lams/tool/notebook/model/NotebookCondition.hbm.xml</value>
-					
-               <value>classpath:org/lamsfoundation/lams/tool/survey/model/SurveyUser.hbm.xml</value>
-               <value>classpath:org/lamsfoundation/lams/tool/survey/model/Survey.hbm.xml</value>
-               <value>classpath:org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml</value>
-               <value>classpath:org/lamsfoundation/lams/tool/survey/model/SurveyOption.hbm.xml</value>
-               <value>classpath:org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.hbm.xml</value>
-               <value>classpath:org/lamsfoundation/lams/tool/survey/model/SurveyAttachment.hbm.xml</value>
-               <value>classpath:org/lamsfoundation/lams/tool/survey/model/SurveySession.hbm.xml</value>
-               <value>classpath:org/lamsfoundation/lams/tool/survey/model/SurveyCondition.hbm.xml</value>
+				<value>classpath:org/lamsfoundation/lams/tool/qa/*.hbm.xml</value>
+				<value>classpath:org/lamsfoundation/lams/tool/notebook/model/*.hbm.xml</value>	
+                <value>classpath:org/lamsfoundation/lams/tool/survey/model/*.hbm.xml</value>
+
 			</list>
 		</property>
 		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>