diff --git a/workflow/engine/classes/class.applications.php b/workflow/engine/classes/class.applications.php
index 4473db067..a25af44ef 100755
--- a/workflow/engine/classes/class.applications.php
+++ b/workflow/engine/classes/class.applications.php
@@ -118,6 +118,9 @@ class Applications
                     case "COMPLETED":
                         $Criteria = $oAppCache->getCompletedListCriteria($userUid);
                         $CriteriaCount = $oAppCache->getCompletedCountCriteria($userUid);
+                        
+                        $Criteria->add (AppCacheViewPeer::DEL_LAST_INDEX,"1");
+                        $CriteriaCount->add (AppCacheViewPeer::DEL_LAST_INDEX,"1");
                         break;
                     default:
                         //All status
diff --git a/workflow/engine/classes/class.pmDynaform.php b/workflow/engine/classes/class.pmDynaform.php
index d9a239653..13c12e315 100644
--- a/workflow/engine/classes/class.pmDynaform.php
+++ b/workflow/engine/classes/class.pmDynaform.php
@@ -119,7 +119,7 @@ class pmDynaform
             if (is_array($items[$key])) {
                 $this->mergeAppData($app_uid, $items[$key]);
             } else {
-                if (isset($this->data[$items[$key]->name])) {
+                if (isset($items[$key]->var_name) && isset($this->data[$items[$key]->var_name])) {
                     if ($items[$key]->type === "grid") {
                         $rows = $this->data[$items[$key]->name];
                         foreach ($rows as $keyRow => $row) {
@@ -153,11 +153,14 @@ class pmDynaform
                     }
                     $items[$key]->options = $options;
                 }
+                if (isset($items[$key]->columns)) {
+                    $this->mergeAppData($app_uid, $items[$key]->columns);
+                }
             }
         }
     }
     
-    public function mergeDynContentAppData($app_uid, $items)
+    public function mergeDynContentAppData($app_uid, &$items)
     {
         $dynContent = G::json_decode($this->record["DYN_CONTENT"]);
         if (isset($dynContent->items)) {