diff --git a/module/api/control.php b/module/api/control.php
index 7d165c8871..ceff0694fa 100644
--- a/module/api/control.php
+++ b/module/api/control.php
@@ -109,8 +109,11 @@ class api extends control
     {
         if(!$this->config->features->apiSQL) die(sprintf($this->lang->api->error->disabled, '$config->features->apiSQL'));
 
-        $sql = isset($_POST['sql']) ? $this->post->sql : '';
-        $this->view->results = $this->api->sql($sql, $keyField);
-        die($this->display());
+        $sql    = isset($_POST['sql']) ? $this->post->sql : '';
+        $output = $this->api->sql($sql, $keyField);
+
+        $output['sql'] = $sql;
+        $this->output  = json_encode($output);
+        die($this->output);
     }
 }
diff --git a/module/api/model.php b/module/api/model.php
index a95cf758df..470f711165 100644
--- a/module/api/model.php
+++ b/module/api/model.php
@@ -96,29 +96,46 @@ class apiModel extends model
     {
         if(!$this->config->features->apiSQL) return sprintf($this->lang->api->error->disabled, '$config->features->apiSQL');
 
-        $sql  = trim($sql);
+        $sql = trim($sql);
         if(strpos($sql, ';') !== false) $sql = substr($sql, 0, strpos($sql, ';'));
-        a($sql);
-        if(empty($sql)) return '';
+
+        $result = array();
+        $result['status']  = 'fail';
+        $result['message'] = '';
+
+        if(empty($sql)) return $result;
 
         if(stripos($sql, 'select ') !== 0)
         {
-            return $this->lang->api->error->onlySelect;
+            $result['message'] = $this->lang->api->error->onlySelect;
+            return $result;
         }
         else
         {
             try
             {
-                $stmt = $this->dao->query($sql);
-                if(empty($keyField)) return $stmt->fetchAll();
+                $stmt = $this->dbh->query($sql);
+
                 $rows = array();
-                while($row = $stmt->fetch()) $rows[$row->$keyField] = $row;
-                return $rows;
+                if(empty($keyField))
+                {
+                    $rows = $stmt->fetchAll();
+                }
+                else
+                {
+                    while($row = $stmt->fetch()) $rows[$row->$keyField] = $row;
+                }
+
+                $result['status'] = 'success';
+                $result['data']   = $rows;
             }
             catch(PDOException $e)
             {
-                return $e->getMessage();
+                $result['status']  = 'fail';
+                $result['message'] = $e->getMessage();
             }
+
+            return $result;
         }
     }
 }