diff --git a/workflow/engine/classes/PmDynaform.php b/workflow/engine/classes/PmDynaform.php
index 28b063a4e..4e0aa58cc 100644
--- a/workflow/engine/classes/PmDynaform.php
+++ b/workflow/engine/classes/PmDynaform.php
@@ -252,6 +252,11 @@ class PmDynaform
                             $dtFields = $json->queryInputData;
                         } else {
                             $dtFields = $this->getValuesDependentFields($json);
+                            foreach ($dtFields as $keyF => $valueF) {
+                                if (isset($this->fields["APP_DATA"][$keyF])) {
+                                    $dtFields[$keyF] = $this->fields["APP_DATA"][$keyF];
+                                }
+                            }
                         }
                         $sql = G::replaceDataField($json->sql, $dtFields);
                         if ($value === "suggest") {