diff --git a/framework/src/Maveriks/WebApplication.php b/framework/src/Maveriks/WebApplication.php
index accc6b8f3..fe9632e83 100644
--- a/framework/src/Maveriks/WebApplication.php
+++ b/framework/src/Maveriks/WebApplication.php
@@ -114,7 +114,9 @@ class WebApplication
             } else {
                 return self::RUNNING_DEFAULT;
             }
-        } elseif (substr($this->requestUri, 1, 3) === "api" && count(explode("/", $this->requestUri)) >= 4 // url api pattern: /api/1.0/<workspace>/<resource>
+        } elseif ($this->requestUri !== "/api/oauth2/token" &&
+            substr($this->requestUri, 1, 3) === "api" &&
+            count(explode("/", $this->requestUri)) >= 4 // url api pattern: /api/1.0/<workspace>/<resource>
         ) {
             return self::RUNNING_API;
         } else {
diff --git a/workflow/engine/classes/ProcessMap.php b/workflow/engine/classes/ProcessMap.php
index 86662b68d..a99c9ab00 100644
--- a/workflow/engine/classes/ProcessMap.php
+++ b/workflow/engine/classes/ProcessMap.php
@@ -4666,32 +4666,27 @@ class ProcessMap
     }
 
     /**
-     * get all the Active process
+     * Get all the active processes
      *
-     * SELECT PROCESS.PRO_UID AS UID, CONTENT.CON_VALUE AS VALUE FROM PROCESS, CONTENT
-     * WHERE (PROCESS.PRO_UID=CONTENT.CON_ID AND PROCESS.PRO_STATUS!='DISABLED' AND CONTENT.CON_CATEGORY='PRO_TITLE' AND CONTENT.CON_LANG='en')
-     * ORDER BY CONTENT.CON_VALUE
-     * ]]>
      */
     public function getAllProcesses()
     {
-        $aProcesses = array();
-        //$aProcesses [] = array ('PRO_UID' => 'char', 'PRO_TITLE' => 'char');
-        $oCriteria = new Criteria('workflow');
-        $oCriteria->addSelectColumn(ProcessPeer::PRO_UID);
-        $oCriteria->add(ProcessPeer::PRO_STATUS, 'DISABLED', Criteria::NOT_EQUAL);
-        $oDataset = ProcessPeer::doSelectRS($oCriteria);
-        $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+        $processes = [];
 
-        $oDataset->next();
-        $oProcess = new Process();
-        while ($aRow = $oDataset->getRow()) {
-            $aProcess = $oProcess->load($aRow['PRO_UID']);
-            $aProcesses[] = array('value' => $aProcess['PRO_UID'], 'name' => $aProcess['PRO_TITLE'] );
-            $oDataset->next();
+        $criteria = new Criteria('workflow');
+        $criteria->addSelectColumn(ProcessPeer::PRO_UID);
+        $criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
+        $criteria->add(ProcessPeer::PRO_STATUS, 'DISABLED', Criteria::NOT_EQUAL);
+        $dataset = ProcessPeer::doSelectRS($criteria);
+        $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+        $dataset->next();
+
+        while ($row = $dataset->getRow()) {
+            $processes[] = ['value' => $row['PRO_UID'], 'name' => $row['PRO_TITLE']];
+            $dataset->next();
         }
-        //$oJSON = new Services_JSON();
-        return Bootstrap::json_encode($aProcesses); //$oJSON->encode( $aProcesses );
+
+        return Bootstrap::json_encode($processes);
     }
 
     /*
diff --git a/workflow/engine/controllers/pmTablesProxy.php b/workflow/engine/controllers/pmTablesProxy.php
index f58fb7bcd..0c45b18dd 100644
--- a/workflow/engine/controllers/pmTablesProxy.php
+++ b/workflow/engine/controllers/pmTablesProxy.php
@@ -519,8 +519,11 @@ class pmTablesProxy extends HttpProxyController
                             $query .= substr($queryRow, 0, -1) . '),';
                             try {
                                 if ($conData == $countRow) {
-                                    $query = substr($query, 0, -1);
-                                    executeQuery($insert . $query . ';', $aAdditionalTables['DBS_UID']);
+                                    $query = $insert . substr($query, 0, -1) . ';';
+                                    $con = Propel::getConnection($aAdditionalTables['DBS_UID']);
+                                    $con->begin();
+                                    $con->executeUpdate($query);
+                                    $con->commit();
                                     $query = '';
                                     $conData = 0;
                                 }
@@ -535,8 +538,11 @@ class pmTablesProxy extends HttpProxyController
                 }
                 fclose($oFile);
                 if ($conData > 0) {
-                    $query = substr($query, 0, -1);
-                    executeQuery($insert . $query . ';', $aAdditionalTables['DBS_UID']);
+                    $query = $insert . substr($query, 0, -1) . ';';
+                    $con = Propel::getConnection($aAdditionalTables['DBS_UID']);
+                    $con->begin();
+                    $con->executeUpdate($query);
+                    $con->commit();
                 }
             }
             if ($sErrorMessages != '') {