diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php
index 1e3f8ac00..f2cfeb078 100644
--- a/workflow/engine/classes/class.processMap.php
+++ b/workflow/engine/classes/class.processMap.php
@@ -6009,16 +6009,6 @@ function getExtTaskUsersAdHocCriteria($sTaskUID = '', $iType = 1) {
     if (UsersPeer::doCount($oCriteria) == 1)
       $user = '1|' . $aRows ['USR_UID'];
 
-    /*$aFields ['LANG'] = SYS_LANG;
-    $aFields ['OP_UID'] = $aRows ['OP_UID'];
-    $aFields ['PRO_UID'] = $aRows ['PRO_UID'];
-    $aFields ['OP_CASE_STATUS'] = $aRows ['OP_CASE_STATUS'];
-    $aFields ['TASK_TARGET'] = $aRows ['TAS_UID'];
-    $aFields ['GROUP_USER'] = $user;
-    $aFields ['TASK_SOURCE'] = $aRows ['OP_TASK_SOURCE'];
-    $aFields ['PARTICIPATED'] = $aRows ['OP_PARTICIPATE'];
-    $aFields ['OBJECT_TYPE'] = $aRows ['OP_OBJ_TYPE'];
-    $aFields ['ACTION'] = $aRows ['OP_ACTION'];*/
 
     $aFields ['LANG'] = SYS_LANG;
     $aFields ['OP_UID'] = $aRows ['OP_UID'];
@@ -6031,100 +6021,28 @@ function getExtTaskUsersAdHocCriteria($sTaskUID = '', $iType = 1) {
     $aFields ['OP_OBJ_TYPE'] = $aRows ['OP_OBJ_TYPE'];
     $aFields ['OP_ACTION'] = $aRows ['OP_ACTION'];
 
+    $lang = defined ( 'SYS_LANG') ? SYS_LANG : 'en';
+    $aFields['TASK_TARGET'] = Content::load ( 'TAS_TITLE', '', $aRows ['TAS_UID'] , $lang );
+    $aFields['TASK_SOURCE'] = Content::load ( 'TAS_TITLE', '', $aRows ['OP_TASK_SOURCE'] , $lang );
+    
     switch ($aRows ['OP_OBJ_TYPE']) {
       /* case 'ANY':
         $aFields['OP_OBJ_TYPE'] = '';
         break; */
       case 'DYNAFORM' :
         $aFields ['DYNAFORM'] = $aRows ['OP_OBJ_UID'];
+        $aFields ['OBJ_NAME'] = Content::load ( 'DYN_TITLE', '', $aRows ['OP_OBJ_UID'] , $lang );
         break;
       case 'INPUT' :
         $aFields ['INPUT'] = $aRows ['OP_OBJ_UID'];
+        $aFields ['OBJ_NAME'] = Content::load ( 'INP_DOC_TITLE', '', $aRows ['OP_OBJ_UID'] , $lang );
         break;
       case 'OUTPUT' :
         $aFields ['OUTPUT'] = $aRows ['OP_OBJ_UID'];
+        $aFields ['OBJ_NAME'] = Content::load ( 'OUT_DOC_TITLE', '', $aRows ['OP_OBJ_UID'] , $lang );
         break;
     }
-    /*
-    $aUsersGroups = array();
-    $aUsersGroups [] = array('UID' => 'char', 'LABEL' => 'char');
-    $oCriteria = new Criteria('workflow');
-    $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
-    $oCriteria->addAsColumn('GRP_TITLE', ContentPeer::CON_VALUE);
-    $aConditions = array();
-    $aConditions [] = array(GroupwfPeer::GRP_UID, ContentPeer::CON_ID);
-    $aConditions [] = array(ContentPeer::CON_CATEGORY, DBAdapter::getStringDelimiter () . 'GRP_TITLE' . DBAdapter::getStringDelimiter ());
-    $aConditions [] = array(ContentPeer::CON_LANG, DBAdapter::getStringDelimiter () . SYS_LANG . DBAdapter::getStringDelimiter ());
-    $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
-    $oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE');
-    $oDataset = GroupwfPeer::doSelectRS($oCriteria);
-    $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-    $oDataset->next();
-    while ($aRow = $oDataset->getRow()) {
-      $aUsersGroups [] = array('UID' => '2|' . $aRow ['GRP_UID'], 'LABEL' => $aRow ['GRP_TITLE'] . ' (' . G::LoadTranslation('ID_GROUP') . ')');
-      $oDataset->next();
-    }
-    $oCriteria = new Criteria('workflow');
-    $oCriteria->addSelectColumn(UsersPeer::USR_UID);
-    $oCriteria->addSelectColumn(UsersPeer::USR_USERNAME);
-    $oCriteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
-    $oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
-    $oCriteria->add(UsersPeer::USR_STATUS, 'ACTIVE');
-    $oDataset = UsersPeer::doSelectRS($oCriteria);
-    $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-    $oDataset->next();
-    while ($aRow = $oDataset->getRow()) {
-      $aUsersGroups [] = array('UID' => '1|' . $aRow ['USR_UID'], 'LABEL' => $aRow ['USR_FIRSTNAME'] . ' ' . $aRow ['USR_LASTNAME'] . ' (' . $aRow ['USR_USERNAME'] . ')');
-      $oDataset->next();
-    }
-
-    $aAllObjects = array();
-    $aAllObjects [] = array('UID' => 'char', 'LABEL' => 'char');
-    $aAllDynaforms = array();
-    $aAllDynaforms [] = array('UID' => 'char', 'LABEL' => 'char');
-    $aAllInputs = array();
-    $aAllInputs [] = array('UID' => 'char', 'LABEL' => 'char');
-    $aAllOutputs = array();
-    $aAllOutputs [] = array('UID' => 'char', 'LABEL' => 'char');
-    //dynaforms
-    $oCriteria = $this->getDynaformsCriteria($aRows ['PRO_UID']);
-    $oCriteria->add(DynaformPeer::DYN_TYPE, 'XMLFORM');
-    $oDataset = DynaformPeer::doSelectRS($oCriteria);
-    $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-    $oDataset->next();
-    while ($aRow = $oDataset->getRow()) {
-      $aAllObjects [] = array('UID' => 'DYNAFORM|' . $aRow ['DYN_UID'], 'LABEL' => $aRow ['DYN_TITLE'] . ' (' . G::LoadTranslation('ID_DYNAFORM') . ')');
-      $aAllDynaforms [] = array('UID' => $aRow ['DYN_UID'], 'LABEL' => $aRow ['DYN_TITLE']);
-      $oDataset->next();
-    }
-    //inputs
-    G::LoadClass('ArrayPeer');
-    $oDataset = ArrayBasePeer::doSelectRS($this->getInputDocumentsCriteria($sProcessUID));
-    $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-    $oDataset->next();
-    while ($aRow = $oDataset->getRow()) {
-      $aAllObjects [] = array('UID' => 'INPUT_DOCUMENT|' . $aRow ['INP_DOC_UID'], 'LABEL' => $aRow ['INP_DOC_TITLE'] . ' (' . G::LoadTranslation('ID_INPUT_DOCUMENT') . ')');
-      $aAllInputs [] = array('UID' => $aRow ['INP_DOC_UID'], 'LABEL' => $aRow ['INP_DOC_TITLE']);
-      $oDataset->next();
-    }
-    //outputs
-    G::LoadClass('ArrayPeer');
-    $oDataset = ArrayBasePeer::doSelectRS($this->getOutputDocumentsCriteria($sProcessUID));
-    $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-    $oDataset->next();
-    while ($aRow = $oDataset->getRow()) {
-      $aAllObjects [] = array('UID' => 'OUTPUT_DOCUMENT|' . $aRow ['OUT_DOC_UID'], 'LABEL' => $aRow ['OUT_DOC_TITLE'] . ' (' . G::LoadTranslation('ID_OUTPUT_DOCUMENT') . ')');
-      $aAllOutputs [] = array('UID' => $aRow ['OUT_DOC_UID'], 'LABEL' => $aRow ['OUT_DOC_TITLE']);
-      $oDataset->next();
-    }
-    global $_DBArray;
-    $_DBArray = (isset($_SESSION ['_DBArray']) ? $_SESSION ['_DBArray'] : '');
-    $_DBArray ['usersGroups'] = $aUsersGroups;
-    $_DBArray ['allObjects'] = $aAllObjects;
-    $_DBArray ['allDynaforms'] = $aAllDynaforms;
-    $_DBArray ['allInputs'] = $aAllInputs;
-    $_DBArray ['allOutputs'] = $aAllOutputs;
-    $_SESSION ['_DBArray'] = $_DBArray;*/
+    
     return $aFields;
   }
 
diff --git a/workflow/engine/templates/bpmn/ProcessMapContext.js b/workflow/engine/templates/bpmn/ProcessMapContext.js
index 14e86d461..8abc9788d 100755
--- a/workflow/engine/templates/bpmn/ProcessMapContext.js
+++ b/workflow/engine/templates/bpmn/ProcessMapContext.js
@@ -338,6 +338,7 @@ ProcessMapContext.prototype.processPermission= function()
             { name: 'OP_PARTICIPATE',type: 'string'},
             { name: 'OP_OBJ_TYPE',type: 'string'},
             { name: 'OP_GROUP_USER',type: 'string'},
+            { name: 'OBJ_NAME',type: 'string'},
             { name: 'OP_ACTION',type: 'string'}
         ]);
 
@@ -644,7 +645,7 @@ var PermissionGridColumn =  new Ext.grid.ColumnModel({
                     fieldLabel: 'Target Task',
                     //hiddenName:'popType',
                     //autoload: true,
-                    name: 'TAS_UID',
+                    name: 'TASK_TARGET',
                     store: selectTaskStore,
                     valueField:'LABEL',
                     displayField:'LABEL',
@@ -681,7 +682,7 @@ var PermissionGridColumn =  new Ext.grid.ColumnModel({
                 ,
                 new Ext.form.ComboBox({
                     fieldLabel: 'Origin Task',
-                    name    : 'OP_TASK_SOURCE',
+                    name    : 'TASK_SOURCE',
                     store: selectTaskStore,
                     valueField:'LABEL',
                     displayField:'LABEL',