diff --git a/workflow/engine/bin/tasks/cliListIds.php b/workflow/engine/bin/tasks/cliListIds.php
index 00fa8153a..6ea52bbf7 100644
--- a/workflow/engine/bin/tasks/cliListIds.php
+++ b/workflow/engine/bin/tasks/cliListIds.php
@@ -7,6 +7,7 @@ EOT
 CLI::taskOpt("lang", "", "lLANG", "lang=LANG");
 CLI::taskArg('workspace');
 CLI::taskRun("list_ids");
+G::LoadClass("wsTools");
 
 function list_ids($command, $args)
 {
@@ -25,39 +26,11 @@ function list_ids($command, $args)
             $workspace->dbInfo['DB_USER'],
             $workspace->dbInfo['DB_PASS']
         );
-        $dbh->query('UPDATE LIST_CANCELED SET '
-            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_CANCELED.USR_UID), '
-            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_CANCELED.TAS_UID), '
-            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_CANCELED.PRO_UID);');
-        $dbh->query('UPDATE LIST_COMPLETED SET '
-            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_COMPLETED.USR_UID), '
-            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_COMPLETED.TAS_UID), '
-            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_COMPLETED.PRO_UID);');
-        $dbh->query('UPDATE LIST_INBOX SET '
-            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_INBOX.USR_UID), '
-            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_INBOX.TAS_UID), '
-            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_INBOX.PRO_UID);');
-        $dbh->query('UPDATE LIST_MY_INBOX SET '
-            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_MY_INBOX.USR_UID), '
-            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_MY_INBOX.TAS_UID), '
-            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_MY_INBOX.PRO_UID);');
-        $dbh->query('UPDATE LIST_PARTICIPATED_HISTORY SET '
-            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PARTICIPATED_HISTORY.USR_UID), '
-            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_PARTICIPATED_HISTORY.TAS_UID), '
-            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PARTICIPATED_HISTORY.PRO_UID);');
-        $dbh->query('UPDATE LIST_PARTICIPATED_LAST SET '
-            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PARTICIPATED_LAST.USR_UID), '
-            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_PARTICIPATED_LAST.TAS_UID), '
-            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PARTICIPATED_LAST.PRO_UID);');
-        $dbh->query('UPDATE LIST_PAUSED SET '
-            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PAUSED.USR_UID), '
-            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_PAUSED.TAS_UID), '
-            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PAUSED.PRO_UID);');
-        $dbh->query('UPDATE LIST_UNASSIGNED SET '
-            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_UNASSIGNED.TAS_UID), '
-            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_UNASSIGNED.PRO_UID);');
-        $dbh->query('UPDATE LIST_UNASSIGNED_GROUP SET '
-            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_UNASSIGNED_GROUP.USR_UID);');
+        foreach(workspaceTools::$populateIdsQueries as $query) {
+            echo ".";
+            $dbh->query($query);
+        }
+        echo "\n";
     }
 
     //Done
diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php
index 1330363c8..f0d279e45 100644
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -24,6 +24,41 @@ class workspaceTools
     public $dbInfoRegExp = "/( *define *\( *'(?P<key>.*?)' *, *\n* *')(?P<value>.*?)(' *\) *;.*)/";
     public $initPropel = false;
     public $initPropelRoot = false;
+    public static $populateIdsQueries = [
+        'UPDATE LIST_CANCELED SET '
+            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_CANCELED.USR_UID),'
+            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_CANCELED.TAS_UID), '
+            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_CANCELED.PRO_UID)',
+        'UPDATE LIST_COMPLETED SET '
+            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_COMPLETED.USR_UID),'
+            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_COMPLETED.TAS_UID), '
+            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_COMPLETED.PRO_UID)',
+        'UPDATE LIST_INBOX SET '
+            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_INBOX.USR_UID),'
+            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_INBOX.TAS_UID), '
+            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_INBOX.PRO_UID)',
+        'UPDATE LIST_MY_INBOX SET '
+            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_MY_INBOX.USR_UID),'
+            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_MY_INBOX.TAS_UID),'
+            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_MY_INBOX.PRO_UID)',
+        'UPDATE LIST_PARTICIPATED_HISTORY SET '
+            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PARTICIPATED_HISTORY.USR_UID),'
+            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_PARTICIPATED_HISTORY.TAS_UID), '
+            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PARTICIPATED_HISTORY.PRO_UID)',
+        'UPDATE LIST_PARTICIPATED_LAST SET '
+            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PARTICIPATED_LAST.USR_UID),'
+            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_PARTICIPATED_LAST.TAS_UID), '
+            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PARTICIPATED_LAST.PRO_UID)',
+        'UPDATE LIST_PAUSED SET '
+            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PAUSED.USR_UID),'
+            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_PAUSED.TAS_UID),'
+            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PAUSED.PRO_UID)',
+        'UPDATE LIST_UNASSIGNED SET '
+            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_UNASSIGNED.TAS_UID), '
+            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_UNASSIGNED.PRO_UID)',
+        'UPDATE LIST_UNASSIGNED_GROUP SET '
+            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_UNASSIGNED_GROUP.USR_UID)',
+    ];
 
     /**
      * Create a workspace tools object.
@@ -3636,39 +3671,9 @@ class workspaceTools
         CLI::logging("->   Populating PRO_ID, USR_ID at LIST_* \n");
         $con->begin();
         $stmt = $con->createStatement();
-        $stmt->executeQuery('UPDATE LIST_CANCELED SET '
-            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_CANCELED.USR_UID),'
-            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_CANCELED.TAS_UID), '
-            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_CANCELED.PRO_UID)');
-        $stmt->executeQuery('UPDATE LIST_COMPLETED SET '
-            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_COMPLETED.USR_UID),'
-            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_COMPLETED.TAS_UID), '
-            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_COMPLETED.PRO_UID)');
-        $stmt->executeQuery('UPDATE LIST_INBOX SET '
-            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_INBOX.USR_UID),'
-            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_INBOX.TAS_UID), '
-            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_INBOX.PRO_UID)');
-        $stmt->executeQuery('UPDATE LIST_MY_INBOX SET '
-            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_MY_INBOX.USR_UID),'
-            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_MY_INBOX.TAS_UID),'
-            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_MY_INBOX.PRO_UID)');
-        $stmt->executeQuery('UPDATE LIST_PARTICIPATED_HISTORY SET '
-            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PARTICIPATED_HISTORY.USR_UID),'
-            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_PARTICIPATED_HISTORY.TAS_UID), '
-            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PARTICIPATED_HISTORY.PRO_UID)');
-        $stmt->executeQuery('UPDATE LIST_PARTICIPATED_LAST SET '
-            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PARTICIPATED_LAST.USR_UID),'
-            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_PARTICIPATED_LAST.TAS_UID), '
-            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PARTICIPATED_LAST.PRO_UID)');
-        $stmt->executeQuery('UPDATE LIST_PAUSED SET '
-            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PAUSED.USR_UID),'
-            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_PAUSED.TAS_UID),'
-            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PAUSED.PRO_UID)');
-        $stmt->executeQuery('UPDATE LIST_UNASSIGNED SET '
-            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_UNASSIGNED.TAS_UID), '
-            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_UNASSIGNED.PRO_UID)');
-        $stmt->executeQuery('UPDATE LIST_UNASSIGNED_GROUP SET '
-            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_UNASSIGNED_GROUP.USR_UID)');
+        foreach(workspaceTools::$populateIdsQueries as $query) {
+            $stmt->executeQuery($query);
+        }
         $con->commit();
 
         CLI::logging("-> Populating PRO_ID, USR_ID at LIST_*  Done \n");
diff --git a/workflow/engine/classes/model/ListCanceled.php b/workflow/engine/classes/model/ListCanceled.php
index d7064ced5..e10462320 100644
--- a/workflow/engine/classes/model/ListCanceled.php
+++ b/workflow/engine/classes/model/ListCanceled.php
@@ -105,16 +105,16 @@ class ListCanceled extends BaseListCanceled {
         $criteriaSet->add(ListParticipatedLastPeer::APP_STATUS, 'CANCELLED');
         BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow"));
 
-        $p = new Process();
         if (!empty($data['PRO_UID'])) {
+            $p = new Process();
             $data['PRO_ID'] =  $p->load($data['PRO_UID'])['PRO_ID'];
         }
-        $u = new Users();
         if (!empty($data['USR_UID'])) {
-            $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
+            $u = new Users();
+            $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID'];
         }
-        $t = new Task();
         if (!empty($data['TAS_UID'])) {
+            $t = new Task();
             $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
         }
         $con = Propel::getConnection( ListCanceledPeer::DATABASE_NAME );
@@ -144,16 +144,12 @@ class ListCanceled extends BaseListCanceled {
      */
     public function update($data)
     {
-        $p = new Process();
-        if (!empty($data['PRO_UID'])) {
-            $data['PRO_ID'] =  $p->load($data['PRO_UID'])['PRO_ID'];
-        }
-        $u = new Users();
         if (!empty($data['USR_UID'])) {
-            $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
+            $u = new Users();
+            $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID'];
         }
-        $t = new Task();
         if (!empty($data['TAS_UID'])) {
+            $t = new Task();
             $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
         }
         $con = Propel::getConnection( ListCanceledPeer::DATABASE_NAME );
diff --git a/workflow/engine/classes/model/ListCompleted.php b/workflow/engine/classes/model/ListCompleted.php
index bd1fcb838..d637ef2bd 100644
--- a/workflow/engine/classes/model/ListCompleted.php
+++ b/workflow/engine/classes/model/ListCompleted.php
@@ -97,16 +97,16 @@ class ListCompleted extends BaseListCompleted
         $criteriaSet->add(ListParticipatedLastPeer::APP_STATUS, 'COMPLETED');
         BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow"));
 
-        $p = new Process();
         if (!empty($data['PRO_UID'])) {
+            $p = new Process();
             $data['PRO_ID'] =  $p->load($data['PRO_UID'])['PRO_ID'];
         }
-        $u = new Users();
         if (!empty($data['USR_UID'])) {
-            $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
+            $u = new Users();
+            $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID'];
         }
-        $t = new Task();
         if (!empty($data['TAS_UID'])) {
+            $t = new Task();
             $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
         }
         $con = Propel::getConnection( ListCompletedPeer::DATABASE_NAME );
@@ -136,16 +136,12 @@ class ListCompleted extends BaseListCompleted
      */
     public function update($data)
     {
-        $p = new Process();
-        if (!empty($data['PRO_UID'])) {
-            $data['PRO_ID'] =  $p->load($data['PRO_UID'])['PRO_ID'];
-        }
-        $u = new Users();
         if (!empty($data['USR_UID'])) {
-            $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
+            $u = new Users();
+            $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID'];
         }
-        $t = new Task();
         if (!empty($data['TAS_UID'])) {
+            $t = new Task();
             $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
         }
         $con = Propel::getConnection( ListCompletedPeer::DATABASE_NAME );
diff --git a/workflow/engine/classes/model/ListInbox.php b/workflow/engine/classes/model/ListInbox.php
index a12806af5..52a7b3eba 100644
--- a/workflow/engine/classes/model/ListInbox.php
+++ b/workflow/engine/classes/model/ListInbox.php
@@ -32,18 +32,21 @@ class ListInbox extends BaseListInbox
                 $aData = $oCase->loadCase( $data["APP_UID"] );
                 $data['APP_TITLE'] = G::replaceDataField($data['APP_TITLE'], $aData['APP_DATA']);
             }
-            $p = new Process();
             if (!empty($data['PRO_UID'])) {
+                $p = new Process();
                 $data['PRO_ID'] =  $p->load($data['PRO_UID'])['PRO_ID'];
             }
-            $u = new Users();
             if (!empty($data['USR_UID'])) {
+                $u = new Users();
                 $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
             }
-            $t = new Task();
             if (!empty($data['TAS_UID'])) {
+                $t = new Task();
                 $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
             }
+            if (!empty($data['APP_STATUS'])) {
+                $data['APP_STATUS_ID'] = Application::$app_status_values[$data['APP_STATUS']];
+            }
             $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
             if ($this->validate()) {
                 $result = $this->save();
@@ -158,18 +161,17 @@ class ListInbox extends BaseListInbox
             $data['DEL_PRIORITY'] = $this->getTaskPriority($data['TAS_UID'], $data['PRO_UID'], $data["APP_UID"]);
         }
 
-        $p = new Process();
-        if (!empty($data['PRO_UID'])) {
-            $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
-        }
-        $u = new Users();
         if (!empty($data['USR_UID'])) {
+            $u = new Users();
             $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
         }
-        $t = new Task();
         if (!empty($data['TAS_UID'])) {
+            $t = new Task();
             $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
         }
+        if (!empty($data['APP_STATUS'])) {
+            $data['APP_STATUS_ID'] = Application::$app_status_values[$data['APP_STATUS']];
+        }
         $con = Propel::getConnection( ListInboxPeer::DATABASE_NAME );
         try {
             $con->begin();
diff --git a/workflow/engine/classes/model/ListMyInbox.php b/workflow/engine/classes/model/ListMyInbox.php
index f20ef41f5..c3a2808c7 100644
--- a/workflow/engine/classes/model/ListMyInbox.php
+++ b/workflow/engine/classes/model/ListMyInbox.php
@@ -25,18 +25,21 @@ class ListMyInbox extends BaseListMyInbox
      */
     public function create($data)
     {
-        $p = new Process();
         if (!empty($data['PRO_UID'])) {
+            $p = new Process();
             $data['PRO_ID'] =  $p->load($data['PRO_UID'])['PRO_ID'];
         }
-        $u = new Users();
         if (!empty($data['USR_UID'])) {
-            $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
+            $u = new Users();
+            $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID'];
         }
-        $t = new Task();
         if (!empty($data['TAS_UID'])) {
+            $t = new Task();
             $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
         }
+        if (!empty($data['APP_STATUS'])) {
+            $data['APP_STATUS_ID'] = Application::$app_status_values[$data['APP_STATUS']];
+        }
         $con = Propel::getConnection( ListMyInboxPeer::DATABASE_NAME );
         try {
             $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
@@ -64,18 +67,17 @@ class ListMyInbox extends BaseListMyInbox
      */
     public function update($data)
     {
-        $p = new Process();
-        if(!empty($data['PRO_UID'])) {
-            $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
-        }
-        $u = new Users();
         if(!empty($data['USR_UID'])) {
-            $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
+            $u = new Users();
+            $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID'];
         }
-        $t = new Task();
         if (!empty($data['TAS_UID'])) {
+            $t = new Task();
             $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
         }
+        if (!empty($data['APP_STATUS'])) {
+            $data['APP_STATUS_ID'] = Application::$app_status_values[$data['APP_STATUS']];
+        }
         $con = Propel::getConnection( ListMyInboxPeer::DATABASE_NAME );
         try {
             $con->begin();
diff --git a/workflow/engine/classes/model/ListParticipatedHistory.php b/workflow/engine/classes/model/ListParticipatedHistory.php
index 4bcbf42d5..87621c3c1 100644
--- a/workflow/engine/classes/model/ListParticipatedHistory.php
+++ b/workflow/engine/classes/model/ListParticipatedHistory.php
@@ -25,16 +25,16 @@ class ListParticipatedHistory extends BaseListParticipatedHistory
      */
     public function create($data)
     {
-        $p = new Process();
         if(!empty($data['PRO_UID'])) {
+            $p = new Process();
             $data['PRO_ID'] =  $p->load($data['PRO_UID'])['PRO_ID'];
         }
-        $u = new Users();
         if(!empty($data['USR_UID'])) {
-            $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
+            $u = new Users();
+            $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID'];
         }
-        $t = new Task();
         if (!empty($data['TAS_UID'])) {
+            $t = new Task();
             $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
         }
         $con = Propel::getConnection( ListParticipatedHistoryPeer::DATABASE_NAME );
@@ -64,16 +64,12 @@ class ListParticipatedHistory extends BaseListParticipatedHistory
      */
     public function update($data)
     {
-        $p = new Process();
-        if(!empty($data['PRO_UID'])) {
-            $data['PRO_ID'] =  $p->load($data['PRO_UID'])['PRO_ID'];
-        }
-        $u = new Users();
         if(!empty($data['USR_UID'])) {
-            $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
+            $u = new Users();
+            $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID'];
         }
-        $t = new Task();
         if (!empty($data['TAS_UID'])) {
+            $t = new Task();
             $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
         }
         $con = Propel::getConnection( ListParticipatedHistoryPeer::DATABASE_NAME );
diff --git a/workflow/engine/classes/model/ListParticipatedLast.php b/workflow/engine/classes/model/ListParticipatedLast.php
index fa01937e8..6e6828f43 100644
--- a/workflow/engine/classes/model/ListParticipatedLast.php
+++ b/workflow/engine/classes/model/ListParticipatedLast.php
@@ -70,18 +70,21 @@ class ListParticipatedLast extends BaseListParticipatedLast
             return;
         }
 
-        $p = new Process();
         if(!empty($data['PRO_UID'])) {
+            $p = new Process();
             $data['PRO_ID'] =  $p->load($data['PRO_UID'])['PRO_ID'];
         }
-        $u = new Users();
         if(!empty($data['USR_UID'])) {
-            $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
+            $u = new Users();
+            $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID'];
         }
-        $t = new Task();
         if (!empty($data['TAS_UID'])) {
+            $t = new Task();
             $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
         }
+        if (!empty($data['APP_STATUS'])) {
+            $data['APP_STATUS_ID'] = Application::$app_status_values[$data['APP_STATUS']];
+        }
         $con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME );
         try {
             $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
@@ -110,18 +113,17 @@ class ListParticipatedLast extends BaseListParticipatedLast
     public function update($data)
     {
         $data['DEL_THREAD_STATUS'] = (isset($data['DEL_THREAD_STATUS'])) ? $data['DEL_THREAD_STATUS'] : 'OPEN';
-        $p = new Process();
-        if(!empty($data['PRO_UID'])) {
-            $data['PRO_ID'] =  $p->load($data['PRO_UID'])['PRO_ID'];
-        }
-        $u = new Users();
         if(!empty($data['USR_UID'])) {
+            $u = new Users();
             $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
         }
-        $t = new Task();
         if (!empty($data['TAS_UID'])) {
+            $t = new Task();
             $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
         }
+        if (!empty($data['APP_STATUS'])) {
+            $data['APP_STATUS_ID'] = Application::$app_status_values[$data['APP_STATUS']];
+        }
         $con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME );
         try {
             $con->begin();
@@ -151,6 +153,17 @@ class ListParticipatedLast extends BaseListParticipatedLast
     public function refresh ($data, $isSelfService = false)
     {
         $data['APP_STATUS'] = (empty($data['APP_STATUS'])) ? 'TO_DO' : $data['APP_STATUS'];
+        if(!empty($data['USR_UID'])) {
+            $u = new Users();
+            $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
+        }
+        if (!empty($data['TAS_UID'])) {
+            $t = new Task();
+            $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
+        }
+        if (!empty($data['APP_STATUS'])) {
+            $data['APP_STATUS_ID'] = Application::$app_status_values[$data['APP_STATUS']];
+        }
         if (!$isSelfService) {
             if ($data["USR_UID"] == "") {
                 return;
diff --git a/workflow/engine/classes/model/ListPaused.php b/workflow/engine/classes/model/ListPaused.php
index d4b67d7a2..1bb91afc9 100644
--- a/workflow/engine/classes/model/ListPaused.php
+++ b/workflow/engine/classes/model/ListPaused.php
@@ -114,13 +114,17 @@ class ListPaused extends BaseListPaused {
         $oListInbox = new ListInbox();
         $oListInbox->remove($data['APP_UID'], $data['DEL_INDEX']);
 
-        $p = new Process();
         if(!empty($data['PRO_UID'])) {
+            $p = new Process();
             $data['PRO_ID'] =  $p->load($data['PRO_UID'])['PRO_ID'];
         }
-        $u = new Users();
         if(!empty($data['USR_UID'])) {
-            $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
+            $u = new Users();
+            $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID'];
+        }
+        if (!empty($data['TAS_UID'])) {
+            $t = new Task();
+            $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
         }
         $con = Propel::getConnection( ListPausedPeer::DATABASE_NAME );
         try {
@@ -149,13 +153,13 @@ class ListPaused extends BaseListPaused {
      */
     public function update($data)
     {
-        $p = new Process();
-        if(!empty($data['PRO_UID'])) {
-            $data['PRO_ID'] =  $p->load($data['PRO_UID'])['PRO_ID'];
-        }
-        $u = new Users();
         if(!empty($data['USR_UID'])) {
-            $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
+            $u = new Users();
+            $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID'];
+        }
+        if (!empty($data['TAS_UID'])) {
+            $t = new Task();
+            $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
         }
         $con = Propel::getConnection( ListPausedPeer::DATABASE_NAME );
         try {
diff --git a/workflow/engine/classes/model/ListUnassigned.php b/workflow/engine/classes/model/ListUnassigned.php
index 29b22ac4c..e95d5c29c 100644
--- a/workflow/engine/classes/model/ListUnassigned.php
+++ b/workflow/engine/classes/model/ListUnassigned.php
@@ -26,12 +26,12 @@ class ListUnassigned extends BaseListUnassigned
      */
     public function create($data)
     {
-        $p = new Process();
         if(!empty($data['PRO_UID'])) {
+            $p = new Process();
             $data['PRO_ID'] =  $p->load($data['PRO_UID'])['PRO_ID'];
         }
-        $t = new Task();
         if (!empty($data['TAS_UID'])) {
+            $t = new Task();
             $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
         }
         $con = Propel::getConnection( ListUnassignedPeer::DATABASE_NAME );
@@ -61,12 +61,8 @@ class ListUnassigned extends BaseListUnassigned
      */
     public function update($data)
     {
-        $p = new Process();
-        if(!empty($data['PRO_UID'])) {
-            $data['PRO_ID'] =  $p->load($data['PRO_UID'])['PRO_ID'];
-        }
-        $t = new Task();
         if (!empty($data['TAS_UID'])) {
+            $t = new Task();
             $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
         }
         $con = Propel::getConnection( ListUnassignedPeer::DATABASE_NAME );
diff --git a/workflow/engine/classes/model/ListUnassignedGroup.php b/workflow/engine/classes/model/ListUnassignedGroup.php
index 242f7802f..66684fda0 100644
--- a/workflow/engine/classes/model/ListUnassignedGroup.php
+++ b/workflow/engine/classes/model/ListUnassignedGroup.php
@@ -24,9 +24,9 @@ class ListUnassignedGroup extends BaseListUnassignedGroup {
      */
     public function create($data)
     { 
-        $u = new Users();
         if(!empty($data['USR_UID'])) {
-            $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
+            $u = new Users();
+            $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID'];
         }
         $con = Propel::getConnection( ListUnassignedGroupPeer::DATABASE_NAME );
         try {
@@ -54,9 +54,9 @@ class ListUnassignedGroup extends BaseListUnassignedGroup {
      */
     public function update($data)
     {
-        $u = new Users();
         if(!empty($data['USR_UID'])) {
-            $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
+            $u = new Users();
+            $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID'];
         }
         $con = Propel::getConnection( ListUnassignedGroupPeer::DATABASE_NAME );
         try {