diff --git a/api/v1/entries/feedbacks.php b/api/v1/entries/feedbacks.php
index 1eeb8c2636..92e58c9ece 100644
--- a/api/v1/entries/feedbacks.php
+++ b/api/v1/entries/feedbacks.php
@@ -14,12 +14,13 @@ class feedbacksEntry extends entry
     /**
      * GET method.
      *
-     * @param  int    $projectID
      * @access public
      * @return void
      */
     public function get()
     {
+        if(strpos(strtolower($this->param('fields')), 'moduleandproduct') !== false) return $this->getModuleAndProduct();
+
         $control = $this->loadController('feedback', 'admin');
         $control->admin($this->param('status', 'unclosed'), 0, $this->param('orderBy', 'id_desc'), 0, $this->param('limit', 20), $this->param('page', 1));
         $data = $this->getData();
@@ -48,80 +49,47 @@ class feedbacksEntry extends entry
     /**
      * POST method.
      *
-     * @param  int    $projectID
      * @access public
      * @return void
      */
-    public function post($projectID = 0)
+    public function post()
     {
-        $fields = 'project,code,name,begin,end,lifetime,desc,days';
+        $fields = 'module,product,type,title,public,desc,status,feedbackBy,notifyEmail,notify,uid';
         $this->batchSetPost($fields);
 
-        $projectID = $this->param('project', $projectID);
-        $this->setPost('project',   $projectID);
-        $this->setPost('acl',       $this->request('acl', 'private'));
-        $this->setPost('PO',        $this->request('PO', ''));
-        $this->setPost('PM',        $this->request('PM', ''));
-        $this->setPost('QD',        $this->request('QD', ''));
-        $this->setPost('RD',        $this->request('RD', ''));
-        $this->setPost('whitelist', $this->request('whitelist', array()));
-        $this->setPost('products',  $this->request('products', array()));
-        $this->setPost('plans',     $this->request('plans', array()));
-
-        $control = $this->loadController('execution', 'create'); $this->requireFields('name,code,begin,end,days');
-        $control->create($projectID);
+        $control = $this->loadController('feedback', 'create');
+        $this->requireFields('title,product');
+        $control->create();
 
         $data = $this->getData();
         if(isset($data->result) and $data->result == 'fail') return $this->sendError(400, $data->message);
 
-        $execution = $this->loadModel('execution')->getByID($data->id);
+        $feedback = $this->loadModel('feedback')->getById($data->id);
 
-        $this->send(201, $this->format($execution, 'openedBy:user,openedDate:time,lastEditedBy:user,lastEditedDate:time,closedBy:user,closedDate:time,canceledBy:user,canceledDate:time,PM:user,PO:user,RD:user,QD:user,whitelist:userList,begin:date,end:date,realBegan:date,realEnd:date,deleted:bool'));
+        $this->send(201, $this->format($feedback, 'openedBy:user,openedDate:time,reviewedBy:user,reviewedDate:time,processedBy:user,processedDate:time,closedBy:user,closedDate:time,editedBy:user,editedDate:time,assignedTo:user,assignedDate:time,feedbackBy:user,mailto:userList,deleted:bool'));
     }
 
     /**
-     * Get drop menu.
+     * GET method.
      *
      * @access public
      * @return void
      */
-    public function getDropMenu()
+    public function getModuleAndProduct()
     {
-        $control = $this->loadController('execution', 'ajaxGetDropMenu');
-        $control->ajaxGetDropMenu($this->request('executionID', 0), $this->request('module', 'execution'), $this->request('method', 'task'), $this->request('extra', ''));
+        $control = $this->loadController('feedback', 'create');
+        $control->create();
 
         $data = $this->getData();
-        if(isset($data->result) and $data->result == 'fail') return $this->sendError(400, $data->message);
 
-        $account  = $this->app->user->account;
-        $projects = $data->data->projects;
-        $dropMenu = array('involved' => array(), 'other' => array(), 'closed' => array());
-        foreach($data->data->executions as $projectID => $projectExecutions)
-        {
-            foreach($projectExecutions as $execution)
-            {
-                if(helper::diffDate(date('Y-m-d'), $execution->end) > 0) $execution->delay = true;
-                $teams     = $execution->teams;
-                $execution = $this->filterFields($execution, 'id,project,model,type,name,code,status,PM,delay');
+        $modules  = $data->data->modules;
+        $products = $data->data->products;
 
-                $projectName = zget($projects, $execution->project, '');
-                if($projectName) $execution->name = $projectName . '/' . $execution->name;
+        $data = array();
+        $data['modules']  = $modules;
+        $data['products'] = $products;
 
-                if($execution->status == 'closed')
-                {
-                    $dropMenu['closed'][] = $execution;
-                }
-                elseif($execution->status != 'done' and $execution->status != 'closed' and ($execution->PM == $account or isset($teams->$account)))
-                {
-                    $dropMenu['involved'][] = $execution;
-                }
-                else
-                {
-                    $dropMenu['other'][] = $execution;
-                }
-            }
-        }
-
-        $this->send(200, $dropMenu);
+        return $this->send(200, $data);
     }
+
 }
diff --git a/api/v1/entries/taskassignto.php b/api/v1/entries/taskassignto.php
index f97c8656ba..bf153f51ee 100644
--- a/api/v1/entries/taskassignto.php
+++ b/api/v1/entries/taskassignto.php
@@ -31,7 +31,7 @@ class taskAssignToEntry extends Entry
         $control->assignTo($task->execution, $taskID);
 
         $data = $this->getData();
-        if(!$data or !isset($data->status)) return $this->send400('error');
+        if(!$data) return $this->send400('error');
         if(isset($data->status) and $data->status == 'fail') return $this->sendError(zget($data, 'code', 400), $data->message);
 
         $task = $this->loadModel('task')->getByID($taskID);