diff --git a/module/ai/config.php b/module/ai/config.php
index d3cd26bfb6..4aaeddc9aa 100644
--- a/module/ai/config.php
+++ b/module/ai/config.php
@@ -66,7 +66,7 @@ $config->ai->dataSource['doc']['doc']                 = array('title', 'addedBy'
 /* Available target form definations. Please also update `$lang->ai->targetForm` upon changes! Some are commented out, these need extra work. */
 $config->ai->targetForm = array();
 // $config->ai->targetForm['product']['tree/managechild']   = (object)array('m' => 'tree', 'f' => 'browse');
-//$config->ai->targetForm['product']['doc/create']         = (object)array('m' => 'doc', 'f' => 'create');
+// $config->ai->targetForm['product']['doc/create']         = (object)array('m' => 'doc', 'f' => 'create');
 $config->ai->targetForm['story']['create']               = (object)array('m' => 'story', 'f' => 'create');
 $config->ai->targetForm['story']['batchcreate']          = (object)array('m' => 'story', 'f' => 'batchcreate');
 $config->ai->targetForm['story']['change']               = (object)array('m' => 'story', 'f' => 'change');
@@ -75,10 +75,10 @@ $config->ai->targetForm['story']['testcasecreate']       = (object)array('m' =>
 $config->ai->targetForm['story']['subdivide']            = (object)array('m' => 'story', 'f' => 'batchcreate');
 $config->ai->targetForm['productplan']['edit']           = (object)array('m' => 'productplan', 'f' => 'edit');
 $config->ai->targetForm['productplan']['create']         = (object)array('m' => 'productplan', 'f' => 'create');
-//$config->ai->targetForm['projectrelease']['doc/create']  = (object)array('m' => 'doc', 'f' => 'create');
+// $config->ai->targetForm['projectrelease']['doc/create']  = (object)array('m' => 'doc', 'f' => 'create');
 // $config->ai->targetForm['project']['risk/create']        = (object)array('m' => 'risk', 'f' => 'create');
 // $config->ai->targetForm['project']['issue/create']       = (object)array('m' => 'issue', 'f' => 'create');
-//$config->ai->targetForm['project']['doc/create']         = (object)array('m' => 'doc', 'f' => 'create');
+// $config->ai->targetForm['project']['doc/create']         = (object)array('m' => 'doc', 'f' => 'create');
 $config->ai->targetForm['project']['programplan/create'] = (object)array('m' => 'programplan', 'f' => 'create');
 $config->ai->targetForm['execution']['batchcreatetask']  = (object)array('m' => 'task', 'f' => 'batchcreate');
 // $config->ai->targetForm['execution']['createtestreport'] = (object)array('m' => 'execution', 'f' => 'testreport');
@@ -92,7 +92,7 @@ $config->ai->targetForm['testcase']['edit']              = (object)array('m' =>
 $config->ai->targetForm['bug']['edit']                   = (object)array('m' => 'bug', 'f' => 'edit');
 $config->ai->targetForm['bug']['story/create']           = (object)array('m' => 'story', 'f' => 'create');
 $config->ai->targetForm['bug']['testcase/create']        = (object)array('m' => 'testcase', 'f' => 'create');
-//$config->ai->targetForm['doc']['create']                 = (object)array('m' => 'doc', 'f' => 'create');
+// $config->ai->targetForm['doc']['create']                 = (object)array('m' => 'doc', 'f' => 'create');
 $config->ai->targetForm['doc']['edit']                   = (object)array('m' => 'doc', 'f' => 'edit');
 
 /* Used to check if form injection is available, generated from `$config->ai->targetForm`. */
diff --git a/module/ai/model.php b/module/ai/model.php
index 44c0d9e745..7b515f1dc7 100644
--- a/module/ai/model.php
+++ b/module/ai/model.php
@@ -1163,7 +1163,7 @@ class aiModel extends model
                                 ->where('tps.story')->eq($objectId)
                                 ->andWhere('tp.project')->ne(0)
                                 ->andWhere('tp.deleted')->eq(0)
-                                ->fetch('tps.project');
+                                ->fetch('project');
                         }
                         if($objectName == 'project')
                         {
@@ -1172,7 +1172,7 @@ class aiModel extends model
                                 ->where('tps.story')->eq($objectId)
                                 ->andWhere('tp.type')->eq('project')
                                 ->andWhere('tp.deleted')->eq(0)
-                                ->fetch('tps.project');
+                                ->fetch('project');
                         }
                         break;
                     case 'productplan': // product, story, branch, execution, task, bug, case, project, doc
@@ -1232,7 +1232,7 @@ class aiModel extends model
                             $vars[] = $this->dao->select('tb.execution')->from(TABLE_BUILD)->alias('tb')
                                 ->leftJoin(TABLE_RELEASE)->alias('tr')->on('tr.build = tb.id')
                                 ->where('tr.id')->eq($objectId)
-                                ->fetch('tb.execution');
+                                ->fetch('execution');
                         }
                         if($objectName == 'bug')
                         {
@@ -1280,7 +1280,7 @@ class aiModel extends model
                             $vars[] = $this->dao->select('tpp.product')->from(TABLE_TASK)->alias('tt')
                                 ->leftJoin(TABLE_PROJECTPRODUCT)->alias('tpp')->on('tpp.project = tt.project')
                                 ->where('tt.id')->eq($objectId)
-                                ->fetch('tpp.product');
+                                ->fetch('product');
                         }
                         if($objectName == 'story')     $vars[] = $this->dao->select('story')->from(TABLE_TASK)->where('id')->eq($objectId)->fetch('story');
                         if($objectName == 'branch')
@@ -1288,14 +1288,14 @@ class aiModel extends model
                             $vars[] = $this->dao->select('tpp.branch')->from(TABLE_TASK)->alias('tt')
                                 ->leftJoin(TABLE_PROJECTPRODUCT)->alias('tpp')->on('tpp.project = tt.project')
                                 ->where('tt.id')->eq($objectId)
-                                ->fetch('tpp.branch');
+                                ->fetch('branch');
                         }
                         if($objectName == 'productplan')
                         {
                             $vars[] = $this->dao->select('tpp.plan')->from(TABLE_TASK)->alias('tt')
                                 ->leftJoin(TABLE_PROJECTPRODUCT)->alias('tpp')->on('tpp.project = tt.project')
                                 ->where('tt.id')->eq($objectId)
-                                ->fetch('tpp.plan');
+                                ->fetch('plan');
                         }
                         if($objectName == 'execution') $vars[] = $this->dao->select('execution')->from(TABLE_TASK)->where('id')->eq($objectId)->fetch('execution');
                         if($objectName == 'bug')       $vars[] = $this->dao->select('max(id) as maxId')->from(TABLE_BUG)->where('task')->eq($objectId)->andWhere('deleted')->eq(0)->fetch('maxId');
@@ -1320,7 +1320,7 @@ class aiModel extends model
                             $vars[] = $this->dao->select('tpp.plan')->from(TABLE_CASE)->alias('tc')
                                 ->leftJoin(TABLE_PROJECTPRODUCT)->alias('tpp')->on('tpp.project = tc.project')
                                 ->where('tc.id')->eq($objectId)
-                                ->fetch('tpp.plan');
+                                ->fetch('plan');
                         }
                         if($objectName == 'task') $vars[] = $this->dao->select('max(task) as maxId')->from(TABLE_BUG)->where('case')->eq($objectId)->andWhere('deleted')->eq(0)->fetch('maxId');
                         if($objectName == 'bug')  $vars[] = $this->dao->select('max(id) as maxId')->from(TABLE_BUG)->where('case')->eq($objectId)->andWhere('deleted')->eq(0)->fetch('maxId');