diff --git a/workflow/engine/classes/class.reportTables.php b/workflow/engine/classes/class.reportTables.php
index 562734812..657a4797b 100755
--- a/workflow/engine/classes/class.reportTables.php
+++ b/workflow/engine/classes/class.reportTables.php
@@ -240,7 +240,7 @@ class ReportTables
                                         if (! isset( $aData[$aField['sFieldName']] )) {
                                             $aData[$aField['sFieldName']] = '';
                                         }
-                                        $sQuery .= ",'" . (isset( $aData[$aField['sFieldName']] ) ? mysql_real_escape_string( $aData[$aField['sFieldName']] ) : '') . "'";
+                                        $sQuery .= ",'" . (isset( $aData[$aField['sFieldName']] ) ? @mysql_real_escape_string( $aData[$aField['sFieldName']] ) : '') . "'";
                                         break;
                                     case 'date':
                                         $value = (isset( $aData[$aField['sFieldName']] ) && trim( $aData[$aField['sFieldName']] )) != '' ? "'" . $aData[$aField['sFieldName']] . "'" : 'NULL';
@@ -599,12 +599,15 @@ class ReportTables
                                         case 'text':
                                             if (! isset( $aFields[$aField['sFieldName']] )) {
                                                 $aFields[$aField['sFieldName']] = '';
-                                            }
-                                            
+                                            }                                            
                                             if(is_array($aFields[$aField['sFieldName']])){
                                                 $sQuery .= "'" . (isset( $aFields[$aField['sFieldName']] ) ? $aFields[$aField['sFieldName']][0] : '') . "',";
                                             }else{
-                                                $sQuery .= "'" . (isset( $aFields[$aField['sFieldName']] ) ? @mysql_real_escape_string( $aFields[$aField['sFieldName']] ) : '') . "',";
+                                                if($aFields[$aField['sFieldName']] == $aFields[$aField['sFieldName'].'_label']){
+                                                    $sQuery .= "'" . (isset( $aFields[$aField['sFieldName']] ) ? @mysql_real_escape_string( $aFields[$aField['sFieldName']] ) : '') . "',";
+                                                }else{
+                                                    $sQuery .= "'" . (isset( $aFields[$aField['sFieldName']] ) ? @mysql_real_escape_string( $aFields[$aField['sFieldName'].'_label'] ) : '') . "',";
+                                                }
                                             }
                                             break;
                                         case 'date':
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php b/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php
index 148ced78b..1285aef81 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php
@@ -463,7 +463,6 @@ class Consolidated
             $json = G::json_decode($dataTask["DYN_CONTENT"]);
             $pmDyna->jsonr($json);
             $fieldsDyna = $json->items[0]->items;
-
             $xmlfrm = new \stdclass();
             $xmlfrm->fields = array();
             foreach ($fieldsDyna as $key => $value) {
@@ -478,7 +477,7 @@ class Consolidated
                     $temp->required = (isset($val->required)) ? $val->required : 0;
                     $temp->mode = (isset($val->mode)) ? $val->mode : 'edit';
 
-                    if (!empty($val->options)) {
+                    if (!empty($val->options) || !empty($val->optionsSql)) {
                         $temp->storeData = '[';
                         foreach ($val->options as $valueOption) {
                             if(isset($valueOption->value)){
@@ -487,6 +486,14 @@ class Consolidated
                                 $temp->storeData .= '["' . $valueOption['value'] . '", "' . $valueOption['label'] . '"],';   
                             }
                         }
+
+                        foreach ($val->optionsSql as $valueOption) {
+                            if(isset($valueOption->value)){
+                                $temp->storeData .= '["' . $valueOption->value . '", "' . $valueOption->label . '"],';
+                            }else{
+                                $temp->storeData .= '["' . $valueOption['value'] . '", "' . $valueOption['label'] . '"],';   
+                            }
+                        }
                         $temp->storeData = substr($temp->storeData,0,-1);
                         $temp->storeData .= ']';
                     }