Index: lams_tool_task/db/model/taskList.clay
===================================================================
diff -u -r0e7e464ded505f35e6ade3811f3f74658668e13a -rece51c9aa41df42fe691659f524e98e84dd7a668
--- lams_tool_task/db/model/taskList.clay	(.../taskList.clay)	(revision 0e7e464ded505f35e6ade3811f3f74658668e13a)
+++ lams_tool_task/db/model/taskList.clay	(.../taskList.clay)	(revision ece51c9aa41df42fe691659f524e98e84dd7a668)
@@ -96,7 +96,7 @@
 </table>
 <table alias="" name="tl_latask10_item_attachment" remarks="" uid="17c04e0:1187758bd62:-7ce8">
 <table-description/>
-<table-figure-bounds height="-1" width="-1" x="610" y="724"/>
+<table-figure-bounds height="-1" width="-1" x="624" y="563"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="" uid="17c04e0:1187758bd62:-7ce6">
 <column-description/>
@@ -219,8 +219,8 @@
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="condition_uid" remarks="" uid="cb0d73:118e986ff6d:-7f6c">
 <column-description/>
 <data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT(%n)">
-<variant type-name-pattern="BIGINT"/>
 <variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
+<variant type-name-pattern="BIGINT"/>
 <variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
 <variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
 <variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
@@ -232,8 +232,8 @@
 <column alias="" auto-increment="false" column-size="11" decimal-digits="0" default-value="" mandatory="true" name="sequence_id" remarks="" uid="cb0d73:118e986ff6d:-7fba">
 <column-description/>
 <data-type jdbc-type="4" name="INT" selected-variant-pattern="INT(%n)">
-<variant type-name-pattern="INT"/>
 <variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n)"/>
+<variant type-name-pattern="INT"/>
 <variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) UNSIGNED"/>
 <variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) UNSIGNED ZEROFILL"/>
 <variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) ZEROFILL"/>
@@ -286,8 +286,8 @@
 <column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="uid" remarks="" uid="e0dfc7:1190824a25d:-7eb4">
 <column-description/>
 <data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT(%n)">
-<variant type-name-pattern="BIGINT"/>
 <variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
+<variant type-name-pattern="BIGINT"/>
 <variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
 <variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
 <variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
@@ -299,8 +299,8 @@
 <column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="condition_uid" remarks="" uid="e0dfc7:1190824a25d:-7eaf">
 <column-description/>
 <data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT(%n)">
-<variant type-name-pattern="BIGINT"/>
 <variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
+<variant type-name-pattern="BIGINT"/>
 <variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
 <variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
 <variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
@@ -322,7 +322,7 @@
 </foreign-key-figure>
 <foreign-key-column column-name="condition_uid" referenced-key-column-name="condition_uid"/>
 </foreign-key>
-<foreign-key alias="" name="FK_tl_latask10_taskList_item_condition_2" on-delete="" on-update="" referenced-key="PRIMARY" referenced-table="tl_latask10_item_attachment" referenced-table-schema="LAMS" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="e0dfc7:1190824a25d:-7dd4">
+<foreign-key alias="" name="FK_tl_latask10_taskList_item_condition_2" on-delete="" on-update="" referenced-key="PRIMARY" referenced-table="tl_latask10_taskList_item" referenced-table-schema="DEFAULT_SCHEMA" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1e33f09:1192bfc48ac:-7f96">
 <foreign-key-description/>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
Index: lams_tool_task/db/sql/create_lams_tool_taskList.sql
===================================================================
diff -u -r0e7e464ded505f35e6ade3811f3f74658668e13a -rece51c9aa41df42fe691659f524e98e84dd7a668
--- lams_tool_task/db/sql/create_lams_tool_taskList.sql	(.../create_lams_tool_taskList.sql)	(revision 0e7e464ded505f35e6ade3811f3f74658668e13a)
+++ lams_tool_task/db/sql/create_lams_tool_taskList.sql	(.../create_lams_tool_taskList.sql)	(revision ece51c9aa41df42fe691659f524e98e84dd7a668)
@@ -124,7 +124,7 @@
 alter table tl_latask10_attachment add index FK_NEW_174079138_1E7009430E79035 (taskList_uid), add constraint FK_NEW_174079138_1E7009430E79035 foreign key (taskList_uid) references tl_latask10_taskList (uid);
 alter table tl_latask10_condition add index FK_tl_latask10_condition_1 (taskList_uid), add constraint FK_tl_latask10_condition_1 foreign key (taskList_uid) references tl_latask10_taskList (uid);
 alter table tl_latask10_condition_taskList_item add index FK_tl_latask10_taskList_item_condition_1 (condition_uid), add constraint FK_tl_latask10_taskList_item_condition_1 foreign key (condition_uid) references tl_latask10_condition (condition_uid);
-alter table tl_latask10_condition_taskList_item add index FK_tl_latask10_taskList_item_condition_2 (uid), add constraint FK_tl_latask10_taskList_item_condition_2 foreign key (uid) references tl_latask10_taskList (uid);
+alter table tl_latask10_condition_taskList_item add index FK_tl_latask10_taskList_item_condition_2 (uid), add constraint FK_tl_latask10_taskList_item_condition_2 foreign key (uid) references tl_latask10_taskList_item (uid);
 alter table tl_latask10_taskList add index FK_NEW_174079138_89093BF758092FB (create_by), add constraint FK_NEW_174079138_89093BF758092FB foreign key (create_by) references tl_latask10_user (uid);
 alter table tl_latask10_taskList_item add index FK_NEW_174079138_F52D1F93758092FB (create_by), add constraint FK_NEW_174079138_F52D1F93758092FB foreign key (create_by) references tl_latask10_user (uid);
 alter table tl_latask10_taskList_item add index FK_NEW_174079138_F52D1F9330E79035 (taskList_uid), add constraint FK_NEW_174079138_F52D1F9330E79035 foreign key (taskList_uid) references tl_latask10_taskList (uid);
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java
===================================================================
diff -u -r1ef27bf016b647ea0c2803d22f2bb4d4b3cde650 -rece51c9aa41df42fe691659f524e98e84dd7a668
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java	(.../TaskList.java)	(revision 1ef27bf016b647ea0c2803d22f2bb4d4b3cde650)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java	(.../TaskList.java)	(revision ece51c9aa41df42fe691659f524e98e84dd7a668)
@@ -465,8 +465,7 @@
      * 					inverse="false"
      * 					order-by="sequence_id asc"
      * @hibernate.collection-key column="taskList_uid"
-     * @hibernate.collection-one-to-many
-     * 			class="org.lamsfoundation.lams.tool.taskList.model.TaskListCondition"
+     * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.taskList.model.TaskListCondition"
      */
 	public Set getConditions() {
 		return conditions;
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.hbm.xml
===================================================================
diff -u -r0e7e464ded505f35e6ade3811f3f74658668e13a -rece51c9aa41df42fe691659f524e98e84dd7a668
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.hbm.xml	(.../TaskListCondition.hbm.xml)	(revision 0e7e464ded505f35e6ade3811f3f74658668e13a)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.hbm.xml	(.../TaskListCondition.hbm.xml)	(revision ece51c9aa41df42fe691659f524e98e84dd7a668)
@@ -40,11 +40,10 @@
             inverse="true"
             cascade="none"
             sort="unsorted"
-            order-by="sequence_id asc"
         >
 
             <key
-                column="uid"
+                column="condition_uid"
             >
             </key>
 
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.java
===================================================================
diff -u -r0e7e464ded505f35e6ade3811f3f74658668e13a -rece51c9aa41df42fe691659f524e98e84dd7a668
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.java	(.../TaskListCondition.java)	(revision 0e7e464ded505f35e6ade3811f3f74658668e13a)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.java	(.../TaskListCondition.java)	(revision ece51c9aa41df42fe691659f524e98e84dd7a668)
@@ -192,9 +192,8 @@
 	 * @hibernate.set lazy="true"
 	 * 				  inverse="true"
 	 * 				  cascade="none"
-	 *                order-by="sequence_id asc"
      * 				  table = "tl_latask10_condition_taskList_item"
-     * @hibernate.collection-key column="uid"
+     * @hibernate.collection-key column="condition_uid"
      * @hibernate.collection-many-to-many class="org.lamsfoundation.lams.tool.taskList.model.TaskListItem"
 	 */
 	public Set getTaskListItems() {