diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/LanguagesData.json b/api/src/Erp.Platform.DbMigrator/Seeds/LanguagesData.json
index 6d7c4e92..4ee32f47 100644
--- a/api/src/Erp.Platform.DbMigrator/Seeds/LanguagesData.json
+++ b/api/src/Erp.Platform.DbMigrator/Seeds/LanguagesData.json
@@ -9551,7 +9551,7 @@
             "resourceName": "Platform",
             "key": "App.SupplyChain.PurchaseOrder",
             "tr": "Siparişler",
-            "en": "Orders"
+            "en": "Purchase Orders"
         },
         {
             "resourceName": "Platform",
diff --git a/ui/src/views/admin/listForm/edit/FormTabDatabaseDelete.tsx b/ui/src/views/admin/listForm/edit/FormTabDatabaseDelete.tsx
index 8df33a85..a17d5fdc 100644
--- a/ui/src/views/admin/listForm/edit/FormTabDatabaseDelete.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabDatabaseDelete.tsx
@@ -76,6 +76,7 @@ function FormTabDatabaseDelete({
                     name="deleteCommand"
                     placeholder={translate('::ListForms.ListFormEdit.DatabaseDeleteCommand')}
                     component={Input}
+                    textArea={true}
                   />
                 </FormItem>
                 <Button block variant="solid" loading={isSubmitting}>
@@ -83,6 +84,102 @@ function FormTabDatabaseDelete({
                 </Button>
               </Card>
 
+              <Card
+                className="my-2"
+                bodyClass="p-0"
+                header={translate('::ListForms.ListFormEdit.DatabaseDeleteFieldsDefaultValues')}
+                headerExtra={translate('::ListForms.ListFormEdit.DatabaseDefaultValuesDescription')}
+              >
+                <Table compact>
+                  <THead>
+                    <Tr>
+                      <Th className="text-center">
+                        <Button
+                          shape="circle"
+                          variant="plain"
+                          type="button"
+                          size="xs"
+                          title="Add"
+                          icon={<FaFileMedical />}
+                          onClick={async (e) => {
+                            e.preventDefault()
+                            setData({
+                              tabName:
+                                ListFormEditTabs.Database.Delete.DeleteFieldsDefaultValuesJsonRow,
+                              operation: 'create',
+                              id: initialValues.id ?? '',
+                              index: -1,
+                            })
+                            setIsOpen(true)
+                          }}
+                        />
+                      </Th>
+                      <Th>{translate('::ListForms.ListFormFieldEdit.FieldName')}</Th>
+                      <Th>{translate('::ListForms.ListFormEdit.FieldDbType')}</Th>
+                      <Th>{translate('::ListForms.ListFormEdit.CustomValueType')}</Th>
+                      <Th>{translate('::ListForms.ListFormEdit.Value')}</Th>
+                      <Th>{translate('::ListForms.ListFormEdit.SqlQuery')}</Th>
+                    </Tr>
+                  </THead>
+                  <TBody>
+                    {initialValues.deleteFieldsDefaultValueDto.map((row: any, index: number) => (
+                      <Tr key={row.fieldName}>
+                        <Td>
+                          <div className="flex-wrap inline-flex xl:flex items-center gap-2">
+                            <Button
+                              shape="circle"
+                              variant="plain"
+                              type="button"
+                              size="xs"
+                              title="Edit"
+                              icon={<FaEdit />}
+                              onClick={() => {
+                                setData({
+                                  tabName:
+                                    ListFormEditTabs.Database.Delete
+                                      .DeleteFieldsDefaultValuesJsonRow,
+                                  operation: 'update',
+                                  id: initialValues.id ?? '',
+                                  index,
+                                  crudValues: initialValues.deleteFieldsDefaultValueDto[index],
+                                })
+                                setIsOpen(true)
+                              }}
+                            />
+                            <Button
+                              shape="circle"
+                              variant="plain"
+                              type="button"
+                              size="xs"
+                              title="Delete"
+                              icon={<FaTrash />}
+                              onClick={() => {
+                                setData({
+                                  tabName:
+                                    ListFormEditTabs.Database.Delete
+                                      .DeleteFieldsDefaultValuesJsonRow,
+                                  operation: 'delete',
+                                  id: initialValues.id ?? '',
+                                  index,
+                                })
+                                setIsOpen(true)
+                              }}
+                            />
+                          </div>
+                        </Td>
+                        <Td>{row.fieldName}</Td>
+                        <Td>
+                          {dbSourceTypeOptions.find((a: any) => a.value === row.fieldDbType)?.label}
+                        </Td>
+                        <Td>{FieldCustomValueTypeEnum[row.customValueType]}</Td>
+                        <Td>{row.value}</Td>
+                        <Td className="break-all">{row.sqlQuery}</Td>
+                      </Tr>
+                    ))}
+                  </TBody>
+                </Table>
+              </Card>
+
               <Card
                 className="my-2"
                 header={translate('::ListForms.ListFormEdit.DatabasePreviewTSQL')}
@@ -105,96 +202,6 @@ function FormTabDatabaseDelete({
           </Form>
         )}
       </Formik>
-      <Card
-        className="my-2"
-        bodyClass="p-0"
-        header={translate('::ListForms.ListFormEdit.DatabaseDeleteFieldsDefaultValues')}
-        headerExtra={translate('::ListForms.ListFormEdit.DatabaseDefaultValuesDescription')}
-      >
-        <Table compact>
-          <THead>
-            <Tr>
-              <Th className="text-center">
-                <Button
-                  shape="circle"
-                  variant="plain"
-                  type="button"
-                  size="xs"
-                  title="Add"
-                  icon={<FaFileMedical />}
-                  onClick={async (e) => {
-                    e.preventDefault()
-                    setData({
-                      tabName: ListFormEditTabs.Database.Delete.DeleteFieldsDefaultValuesJsonRow,
-                      operation: 'create',
-                      id: initialValues.id ?? '',
-                      index: -1,
-                    })
-                    setIsOpen(true)
-                  }}
-                />
-              </Th>
-              <Th>{translate('::ListForms.ListFormFieldEdit.FieldName')}</Th>
-              <Th>{translate('::ListForms.ListFormEdit.FieldDbType')}</Th>
-              <Th>{translate('::ListForms.ListFormEdit.CustomValueType')}</Th>
-              <Th>{translate('::ListForms.ListFormEdit.Value')}</Th>
-              <Th>{translate('::ListForms.ListFormEdit.SqlQuery')}</Th>
-            </Tr>
-          </THead>
-          <TBody>
-            {initialValues.deleteFieldsDefaultValueDto.map((row: any, index: number) => (
-              <Tr key={row.fieldName}>
-                <Td>
-                  <div className="flex-wrap inline-flex xl:flex items-center gap-2">
-                    <Button
-                      shape="circle"
-                      variant="plain"
-                      type="button"
-                      size="xs"
-                      title="Edit"
-                      icon={<FaEdit />}
-                      onClick={() => {
-                        setData({
-                          tabName:
-                            ListFormEditTabs.Database.Delete.DeleteFieldsDefaultValuesJsonRow,
-                          operation: 'update',
-                          id: initialValues.id ?? '',
-                          index,
-                          crudValues: initialValues.deleteFieldsDefaultValueDto[index],
-                        })
-                        setIsOpen(true)
-                      }}
-                    />
-                    <Button
-                      shape="circle"
-                      variant="plain"
-                      type="button"
-                      size="xs"
-                      title="Delete"
-                      icon={<FaTrash />}
-                      onClick={() => {
-                        setData({
-                          tabName:
-                            ListFormEditTabs.Database.Delete.DeleteFieldsDefaultValuesJsonRow,
-                          operation: 'delete',
-                          id: initialValues.id ?? '',
-                          index,
-                        })
-                        setIsOpen(true)
-                      }}
-                    />
-                  </div>
-                </Td>
-                <Td>{row.fieldName}</Td>
-                <Td>{dbSourceTypeOptions.find((a: any) => a.value === row.fieldDbType)?.label}</Td>
-                <Td>{FieldCustomValueTypeEnum[row.customValueType]}</Td>
-                <Td>{row.value}</Td>
-                <Td className="break-all">{row.sqlQuery}</Td>
-              </Tr>
-            ))}
-          </TBody>
-        </Table>
-      </Card>
     </Container>
   )
 }
diff --git a/ui/src/views/admin/listForm/edit/FormTabDatabaseInsert.tsx b/ui/src/views/admin/listForm/edit/FormTabDatabaseInsert.tsx
index d39194b1..a72c0613 100644
--- a/ui/src/views/admin/listForm/edit/FormTabDatabaseInsert.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabDatabaseInsert.tsx
@@ -76,6 +76,7 @@ function FormTabDatabaseInsert({
                     name="insertCommand"
                     placeholder={translate('::ListForms.ListFormEdit.DatabaseInsertCommand')}
                     component={Input}
+                    textArea={true}
                   />
                 </FormItem>
                 <Button block variant="solid" loading={isSubmitting}>
@@ -83,6 +84,199 @@ function FormTabDatabaseInsert({
                 </Button>
               </Card>
 
+              <Card
+                className="my-2"
+                bodyClass="p-0"
+                header={translate('::ListForms.ListFormEdit.DatabaseInsertFieldsDefaultValues')}
+                headerExtra={translate('::ListForms.ListFormEdit.DatabaseDefaultValuesDescription')}
+              >
+                <Table compact>
+                  <THead>
+                    <Tr>
+                      <Th className="text-center">
+                        <Button
+                          shape="circle"
+                          variant="plain"
+                          type="button"
+                          size="xs"
+                          title="Add"
+                          icon={<FaFileMedical />}
+                          onClick={async (e) => {
+                            e.preventDefault()
+                            setData({
+                              tabName:
+                                ListFormEditTabs.Database.Insert.InsertFieldsDefaultValuesJsonRow,
+                              operation: 'create',
+                              id: initialValues.id ?? '',
+                              index: -1,
+                            })
+                            setIsOpen(true)
+                          }}
+                        />
+                      </Th>
+                      <Th>{translate('::ListForms.ListFormFieldEdit.FieldName')}</Th>
+                      <Th>{translate('::ListForms.ListFormEdit.FieldDbType')}</Th>
+                      <Th>{translate('::ListForms.ListFormEdit.CustomValueType')}</Th>
+                      <Th>{translate('::ListForms.ListFormEdit.Value')}</Th>
+                      <Th>{translate('::ListForms.ListFormEdit.SqlQuery')}</Th>
+                    </Tr>
+                  </THead>
+                  <TBody>
+                    {initialValues.insertFieldsDefaultValueDto.map((row: any, index: number) => (
+                      <Tr key={row.fieldName}>
+                        <Td>
+                          <div className="flex-wrap inline-flex xl:flex items-center gap-2">
+                            <Button
+                              shape="circle"
+                              variant="plain"
+                              type="button"
+                              size="xs"
+                              title="Edit"
+                              icon={<FaEdit />}
+                              onClick={() => {
+                                setData({
+                                  tabName:
+                                    ListFormEditTabs.Database.Insert
+                                      .InsertFieldsDefaultValuesJsonRow,
+                                  operation: 'update',
+                                  id: initialValues.id ?? '',
+                                  index,
+                                  crudValues: initialValues.insertFieldsDefaultValueDto[index],
+                                })
+                                setIsOpen(true)
+                              }}
+                            />
+                            <Button
+                              shape="circle"
+                              variant="plain"
+                              type="button"
+                              size="xs"
+                              title="Delete"
+                              icon={<FaTrash />}
+                              onClick={() => {
+                                setData({
+                                  tabName:
+                                    ListFormEditTabs.Database.Insert
+                                      .InsertFieldsDefaultValuesJsonRow,
+                                  operation: 'delete',
+                                  id: initialValues.id ?? '',
+                                  index,
+                                })
+                                setIsOpen(true)
+                              }}
+                            />
+                          </div>
+                        </Td>
+                        <Td>{row.fieldName}</Td>
+                        <Td>
+                          {dbSourceTypeOptions.find((a: any) => a.value === row.fieldDbType)?.label}
+                        </Td>
+                        <Td>{FieldCustomValueTypeEnum[row.customValueType]}</Td>
+                        <Td>{row.value}</Td>
+                        <Td className="break-all">{row.sqlQuery}</Td>
+                      </Tr>
+                    ))}
+                  </TBody>
+                </Table>
+              </Card>
+              <Card
+                className="my-2"
+                bodyClass="p-0"
+                header={translate(
+                  '::ListForms.ListFormEdit.DatabaseFormDefaultFieldsDefaultValues',
+                )}
+                headerExtra={translate(
+                  '::ListForms.ListFormEdit.DatabaseFormDefaultFieldsDefaultValuesDescription',
+                )}
+              >
+                <Table compact>
+                  <THead>
+                    <Tr>
+                      <Th className="text-center">
+                        <Button
+                          shape="circle"
+                          variant="plain"
+                          type="button"
+                          size="xs"
+                          title="Add"
+                          icon={<FaFileMedical />}
+                          onClick={async (e) => {
+                            e.preventDefault()
+                            setData({
+                              tabName:
+                                ListFormEditTabs.Database.Insert.FormFieldsDefaultValuesJsonRow,
+                              operation: 'create',
+                              id: initialValues.id ?? '',
+                              index: -1,
+                            })
+                            setIsOpen(true)
+                          }}
+                        />
+                      </Th>
+                      <Th>{translate('::ListForms.ListFormFieldEdit.FieldName')}</Th>
+                      <Th>{translate('::ListForms.ListFormEdit.FieldDbType')}</Th>
+                      <Th>{translate('::ListForms.ListFormEdit.CustomValueType')}</Th>
+                      <Th>{translate('::ListForms.ListFormEdit.Value')}</Th>
+                      <Th>{translate('::ListForms.ListFormEdit.SqlQuery')}</Th>
+                    </Tr>
+                  </THead>
+                  <TBody>
+                    {initialValues.formFieldsDefaultValueDto.map((row: any, index: number) => (
+                      <Tr key={row.fieldName}>
+                        <Td>
+                          <div className="flex-wrap inline-flex xl:flex items-center gap-2">
+                            <Button
+                              shape="circle"
+                              variant="plain"
+                              type="button"
+                              size="xs"
+                              title="Edit"
+                              icon={<FaEdit />}
+                              onClick={() => {
+                                setData({
+                                  tabName:
+                                    ListFormEditTabs.Database.Insert.FormFieldsDefaultValuesJsonRow,
+                                  operation: 'update',
+                                  id: initialValues.id ?? '',
+                                  index,
+                                  crudValues: initialValues.formFieldsDefaultValueDto[index],
+                                })
+                                setIsOpen(true)
+                              }}
+                            />
+                            <Button
+                              shape="circle"
+                              variant="plain"
+                              type="button"
+                              size="xs"
+                              title="Delete"
+                              icon={<FaTrash />}
+                              onClick={() => {
+                                setData({
+                                  tabName:
+                                    ListFormEditTabs.Database.Insert.FormFieldsDefaultValuesJsonRow,
+                                  operation: 'delete',
+                                  id: initialValues.id ?? '',
+                                  index,
+                                })
+                                setIsOpen(true)
+                              }}
+                            />
+                          </div>
+                        </Td>
+                        <Td>{row.fieldName}</Td>
+                        <Td>
+                          {dbSourceTypeOptions.find((a: any) => a.value === row.fieldDbType)?.label}
+                        </Td>
+                        <Td>{FieldCustomValueTypeEnum[row.customValueType]}</Td>
+                        <Td>{row.value}</Td>
+                        <Td className="break-all">{row.sqlQuery}</Td>
+                      </Tr>
+                    ))}
+                  </TBody>
+                </Table>
+              </Card>
+
               <Card
                 className="my-2"
                 header={translate('::ListForms.ListFormEdit.DatabasePreviewTSQL')}
@@ -105,188 +299,6 @@ function FormTabDatabaseInsert({
           </Form>
         )}
       </Formik>
-      <Card
-        className="my-2"
-        bodyClass="p-0"
-        header={translate('::ListForms.ListFormEdit.DatabaseInsertFieldsDefaultValues')}
-        headerExtra={translate(
-          '::ListForms.ListFormEdit.DatabaseDefaultValuesDescription',
-        )}
-      >
-        <Table compact>
-          <THead>
-            <Tr>
-              <Th className="text-center">
-                <Button
-                  shape="circle"
-                  variant="plain"
-                  type="button"
-                  size="xs"
-                  title="Add"
-                  icon={<FaFileMedical />}
-                  onClick={async (e) => {
-                    e.preventDefault()
-                    setData({
-                      tabName: ListFormEditTabs.Database.Insert.InsertFieldsDefaultValuesJsonRow,
-                      operation: 'create',
-                      id: initialValues.id ?? '',
-                      index: -1,
-                    })
-                    setIsOpen(true)
-                  }}
-                />
-              </Th>
-              <Th>{translate('::ListForms.ListFormFieldEdit.FieldName')}</Th>
-              <Th>{translate('::ListForms.ListFormEdit.FieldDbType')}</Th>
-              <Th>{translate('::ListForms.ListFormEdit.CustomValueType')}</Th>
-              <Th>{translate('::ListForms.ListFormEdit.Value')}</Th>
-              <Th>{translate('::ListForms.ListFormEdit.SqlQuery')}</Th>
-            </Tr>
-          </THead>
-          <TBody>
-            {initialValues.insertFieldsDefaultValueDto.map((row: any, index: number) => (
-              <Tr key={row.fieldName}>
-                <Td>
-                  <div className="flex-wrap inline-flex xl:flex items-center gap-2">
-                    <Button
-                      shape="circle"
-                      variant="plain"
-                      type="button"
-                      size="xs"
-                      title="Edit"
-                      icon={<FaEdit />}
-                      onClick={() => {
-                        setData({
-                          tabName:
-                            ListFormEditTabs.Database.Insert.InsertFieldsDefaultValuesJsonRow,
-                          operation: 'update',
-                          id: initialValues.id ?? '',
-                          index,
-                          crudValues: initialValues.insertFieldsDefaultValueDto[index],
-                        })
-                        setIsOpen(true)
-                      }}
-                    />
-                    <Button
-                      shape="circle"
-                      variant="plain"
-                      type="button"
-                      size="xs"
-                      title="Delete"
-                      icon={<FaTrash />}
-                      onClick={() => {
-                        setData({
-                          tabName:
-                            ListFormEditTabs.Database.Insert.InsertFieldsDefaultValuesJsonRow,
-                          operation: 'delete',
-                          id: initialValues.id ?? '',
-                          index,
-                        })
-                        setIsOpen(true)
-                      }}
-                    />
-                  </div>
-                </Td>
-                <Td>{row.fieldName}</Td>
-                <Td>{dbSourceTypeOptions.find((a: any) => a.value === row.fieldDbType)?.label}</Td>
-                <Td>{FieldCustomValueTypeEnum[row.customValueType]}</Td>
-                <Td>{row.value}</Td>
-                <Td className="break-all">{row.sqlQuery}</Td>
-              </Tr>
-            ))}
-          </TBody>
-        </Table>
-      </Card>
-      <Card
-        className="my-2"
-        bodyClass="p-0"
-        header={translate('::ListForms.ListFormEdit.DatabaseFormDefaultFieldsDefaultValues')}
-        headerExtra={translate(
-          '::ListForms.ListFormEdit.DatabaseFormDefaultFieldsDefaultValuesDescription',
-        )}
-      >
-        <Table compact>
-          <THead>
-            <Tr>
-              <Th className="text-center">
-                <Button
-                  shape="circle"
-                  variant="plain"
-                  type="button"
-                  size="xs"
-                  title="Add"
-                  icon={<FaFileMedical />}
-                  onClick={async (e) => {
-                    e.preventDefault()
-                    setData({
-                      tabName: ListFormEditTabs.Database.Insert.FormFieldsDefaultValuesJsonRow,
-                      operation: 'create',
-                      id: initialValues.id ?? '',
-                      index: -1,
-                    })
-                    setIsOpen(true)
-                  }}
-                />
-              </Th>
-              <Th>{translate('::ListForms.ListFormFieldEdit.FieldName')}</Th>
-              <Th>{translate('::ListForms.ListFormEdit.FieldDbType')}</Th>
-              <Th>{translate('::ListForms.ListFormEdit.CustomValueType')}</Th>
-              <Th>{translate('::ListForms.ListFormEdit.Value')}</Th>
-              <Th>{translate('::ListForms.ListFormEdit.SqlQuery')}</Th>
-            </Tr>
-          </THead>
-          <TBody>
-            {initialValues.formFieldsDefaultValueDto.map((row: any, index: number) => (
-              <Tr key={row.fieldName}>
-                <Td>
-                  <div className="flex-wrap inline-flex xl:flex items-center gap-2">
-                    <Button
-                      shape="circle"
-                      variant="plain"
-                      type="button"
-                      size="xs"
-                      title="Edit"
-                      icon={<FaEdit />}
-                      onClick={() => {
-                        setData({
-                          tabName: ListFormEditTabs.Database.Insert.FormFieldsDefaultValuesJsonRow,
-                          operation: 'update',
-                          id: initialValues.id ?? '',
-                          index,
-                          crudValues: initialValues.formFieldsDefaultValueDto[index],
-                        })
-                        setIsOpen(true)
-                      }}
-                    />
-                    <Button
-                      shape="circle"
-                      variant="plain"
-                      type="button"
-                      size="xs"
-                      title="Delete"
-                      icon={<FaTrash />}
-                      onClick={() => {
-                        setData({
-                          tabName: ListFormEditTabs.Database.Insert.FormFieldsDefaultValuesJsonRow,
-                          operation: 'delete',
-                          id: initialValues.id ?? '',
-                          index,
-                        })
-                        setIsOpen(true)
-                      }}
-                    />
-                  </div>
-                </Td>
-                <Td>{row.fieldName}</Td>
-                <Td>{dbSourceTypeOptions.find((a: any) => a.value === row.fieldDbType)?.label}</Td>
-                <Td>{FieldCustomValueTypeEnum[row.customValueType]}</Td>
-                <Td>{row.value}</Td>
-                <Td className="break-all">{row.sqlQuery}</Td>
-              </Tr>
-            ))}
-          </TBody>
-        </Table>
-      </Card>
     </Container>
   )
 }
diff --git a/ui/src/views/admin/listForm/edit/FormTabDatabaseSelect.tsx b/ui/src/views/admin/listForm/edit/FormTabDatabaseSelect.tsx
index 3631d9ae..ac43ebad 100644
--- a/ui/src/views/admin/listForm/edit/FormTabDatabaseSelect.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabDatabaseSelect.tsx
@@ -70,6 +70,106 @@ function FormTabDatabaseSelect({
                 </Button>
               </Card>
 
+              <Card
+                className="my-2"
+                bodyClass="p-0"
+                header={translate(
+                  '::ListForms.ListFormEdit.DatabaseSelectSelectFieldsDefaultValues',
+                )}
+                headerExtra={translate(
+                  '::ListForms.ListFormEdit.DatabaseSelectSelectFieldsDefaultValuesDescription',
+                )}
+              >
+                <Table compact>
+                  <THead>
+                    <Tr>
+                      <Th className="text-center">
+                        <Button
+                          shape="circle"
+                          variant="plain"
+                          type="button"
+                          size="xs"
+                          title="Add"
+                          icon={<FaFileMedical />}
+                          onClick={async (e) => {
+                            e.preventDefault()
+                            setData({
+                              tabName:
+                                ListFormEditTabs.Database.Select.SelectFieldsDefaultValuesJsonRow,
+                              operation: 'create',
+                              id: initialValues.id ?? '',
+                              index: -1,
+                            })
+                            setIsOpen(true)
+                          }}
+                        />
+                      </Th>
+                      <Th>{translate('::ListForms.ListFormFieldEdit.FieldName')}</Th>
+                      <Th>{translate('::ListForms.ListFormEdit.FieldDbType')}</Th>
+                      <Th>{translate('::ListForms.ListFormEdit.CustomValueType')}</Th>
+                      <Th>{translate('::ListForms.ListFormEdit.Value')}</Th>
+                      <Th>{translate('::ListForms.ListFormEdit.SqlQuery')}</Th>
+                    </Tr>
+                  </THead>
+                  <TBody>
+                    {initialValues.selectFieldsDefaultValueDto.map((row: any, index: number) => (
+                      <Tr key={row.fieldName}>
+                        <Td>
+                          <div className="flex-wrap inline-flex xl:flex items-center gap-2">
+                            <Button
+                              shape="circle"
+                              variant="plain"
+                              type="button"
+                              size="xs"
+                              title="Edit"
+                              icon={<FaEdit />}
+                              onClick={() => {
+                                setData({
+                                  tabName:
+                                    ListFormEditTabs.Database.Select
+                                      .SelectFieldsDefaultValuesJsonRow,
+                                  operation: 'update',
+                                  id: initialValues.id ?? '',
+                                  index,
+                                  crudValues: initialValues.selectFieldsDefaultValueDto[index],
+                                })
+                                setIsOpen(true)
+                              }}
+                            />
+                            <Button
+                              shape="circle"
+                              variant="plain"
+                              type="button"
+                              size="xs"
+                              title="Delete"
+                              icon={<FaTrash />}
+                              onClick={() => {
+                                setData({
+                                  tabName:
+                                    ListFormEditTabs.Database.Select
+                                      .SelectFieldsDefaultValuesJsonRow,
+                                  operation: 'delete',
+                                  id: initialValues.id ?? '',
+                                  index,
+                                })
+                                setIsOpen(true)
+                              }}
+                            />
+                          </div>
+                        </Td>
+                        <Td>{row.fieldName}</Td>
+                        <Td>
+                          {dbSourceTypeOptions.find((a: any) => a.value === row.fieldDbType)?.label}
+                        </Td>
+                        <Td>{FieldCustomValueTypeEnum[row.customValueType]}</Td>
+                        <Td>{row.value}</Td>
+                        <Td className="break-all">{row.sqlQuery}</Td>
+                      </Tr>
+                    ))}
+                  </TBody>
+                </Table>
+              </Card>
+
               <Card
                 className="my-2"
                 header={translate('::ListForms.ListFormEdit.DatabasePreviewTSQL')}
@@ -92,98 +192,6 @@ function FormTabDatabaseSelect({
           </Form>
         )}
       </Formik>
-      <Card
-        className="my-2"
-        bodyClass="p-0"
-        header={translate('::ListForms.ListFormEdit.DatabaseSelectSelectFieldsDefaultValues')}
-        headerExtra={translate(
-          '::ListForms.ListFormEdit.DatabaseSelectSelectFieldsDefaultValuesDescription',
-        )}
-      >
-        <Table compact>
-          <THead>
-            <Tr>
-              <Th className="text-center">
-                <Button
-                  shape="circle"
-                  variant="plain"
-                  type="button"
-                  size="xs"
-                  title="Add"
-                  icon={<FaFileMedical />}
-                  onClick={async (e) => {
-                    e.preventDefault()
-                    setData({
-                      tabName: ListFormEditTabs.Database.Select.SelectFieldsDefaultValuesJsonRow,
-                      operation: 'create',
-                      id: initialValues.id ?? '',
-                      index: -1,
-                    })
-                    setIsOpen(true)
-                  }}
-                />
-              </Th>
-              <Th>{translate('::ListForms.ListFormFieldEdit.FieldName')}</Th>
-              <Th>{translate('::ListForms.ListFormEdit.FieldDbType')}</Th>
-              <Th>{translate('::ListForms.ListFormEdit.CustomValueType')}</Th>
-              <Th>{translate('::ListForms.ListFormEdit.Value')}</Th>
-              <Th>{translate('::ListForms.ListFormEdit.SqlQuery')}</Th>
-            </Tr>
-          </THead>
-          <TBody>
-            {initialValues.selectFieldsDefaultValueDto.map((row: any, index: number) => (
-              <Tr key={row.fieldName}>
-                <Td>
-                  <div className="flex-wrap inline-flex xl:flex items-center gap-2">
-                    <Button
-                      shape="circle"
-                      variant="plain"
-                      type="button"
-                      size="xs"
-                      title="Edit"
-                      icon={<FaEdit />}
-                      onClick={() => {
-                        setData({
-                          tabName:
-                            ListFormEditTabs.Database.Select.SelectFieldsDefaultValuesJsonRow,
-                          operation: 'update',
-                          id: initialValues.id ?? '',
-                          index,
-                          crudValues: initialValues.selectFieldsDefaultValueDto[index],
-                        })
-                        setIsOpen(true)
-                      }}
-                    />
-                    <Button
-                      shape="circle"
-                      variant="plain"
-                      type="button"
-                      size="xs"
-                      title="Delete"
-                      icon={<FaTrash />}
-                      onClick={() => {
-                        setData({
-                          tabName:
-                            ListFormEditTabs.Database.Select.SelectFieldsDefaultValuesJsonRow,
-                          operation: 'delete',
-                          id: initialValues.id ?? '',
-                          index,
-                        })
-                        setIsOpen(true)
-                      }}
-                    />
-                  </div>
-                </Td>
-                <Td>{row.fieldName}</Td>
-                <Td>{dbSourceTypeOptions.find((a: any) => a.value === row.fieldDbType)?.label}</Td>
-                <Td>{FieldCustomValueTypeEnum[row.customValueType]}</Td>
-                <Td>{row.value}</Td>
-                <Td className="break-all">{row.sqlQuery}</Td>
-              </Tr>
-            ))}
-          </TBody>
-        </Table>
-      </Card>
     </Container>
   )
 }
diff --git a/ui/src/views/admin/listForm/edit/FormTabDatabaseUpdate.tsx b/ui/src/views/admin/listForm/edit/FormTabDatabaseUpdate.tsx
index 905b329b..36a12e44 100644
--- a/ui/src/views/admin/listForm/edit/FormTabDatabaseUpdate.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabDatabaseUpdate.tsx
@@ -76,6 +76,7 @@ function FormTabDatabaseUpdate({
                     name="updateCommand"
                     placeholder={translate('::ListForms.ListFormEdit.DatabaseUpdateCommand')}
                     component={Input}
+                    textArea={true}
                   />
                 </FormItem>
                 <Button block variant="solid" loading={isSubmitting}>
@@ -83,6 +84,104 @@ function FormTabDatabaseUpdate({
                 </Button>
               </Card>
 
+              <Card
+                className="my-2"
+                bodyClass="p-0"
+                header={translate('::ListForms.ListFormEdit.DatabaseUpdateFieldsDefaultValues')}
+                headerExtra={translate(
+                  '::ListForms.ListFormEdit.DatabaseUpdateFieldsDefaultValuesDescription',
+                )}
+              >
+                <Table compact>
+                  <THead>
+                    <Tr>
+                      <Th className="text-center">
+                        <Button
+                          shape="circle"
+                          variant="plain"
+                          type="button"
+                          size="xs"
+                          title="Add"
+                          icon={<FaFileMedical />}
+                          onClick={async (e) => {
+                            e.preventDefault()
+                            setData({
+                              tabName:
+                                ListFormEditTabs.Database.Update.UpdateFieldsDefaultValuesJsonRow,
+                              operation: 'create',
+                              id: initialValues.id ?? '',
+                              index: -1,
+                            })
+                            setIsOpen(true)
+                          }}
+                        />
+                      </Th>
+                      <Th>{translate('::ListForms.ListFormFieldEdit.FieldName')}</Th>
+                      <Th>{translate('::ListForms.ListFormEdit.FieldDbType')}</Th>
+                      <Th>{translate('::ListForms.ListFormEdit.CustomValueType')}</Th>
+                      <Th>{translate('::ListForms.ListFormEdit.Value')}</Th>
+                      <Th>{translate('::ListForms.ListFormEdit.SqlQuery')}</Th>
+                    </Tr>
+                  </THead>
+                  <TBody>
+                    {initialValues.updateFieldsDefaultValueDto.map((row: any, index: number) => (
+                      <Tr key={row.fieldName}>
+                        <Td>
+                          <div className="flex-wrap inline-flex xl:flex items-center gap-2">
+                            <Button
+                              shape="circle"
+                              variant="plain"
+                              type="button"
+                              size="xs"
+                              title="Edit"
+                              icon={<FaEdit />}
+                              onClick={() => {
+                                setData({
+                                  tabName:
+                                    ListFormEditTabs.Database.Update
+                                      .UpdateFieldsDefaultValuesJsonRow,
+                                  operation: 'update',
+                                  id: initialValues.id ?? '',
+                                  index,
+                                  crudValues: initialValues.updateFieldsDefaultValueDto[index],
+                                })
+                                setIsOpen(true)
+                              }}
+                            />
+                            <Button
+                              shape="circle"
+                              variant="plain"
+                              type="button"
+                              size="xs"
+                              title="Delete"
+                              icon={<FaTrash />}
+                              onClick={() => {
+                                setData({
+                                  tabName:
+                                    ListFormEditTabs.Database.Update
+                                      .UpdateFieldsDefaultValuesJsonRow,
+                                  operation: 'delete',
+                                  id: initialValues.id ?? '',
+                                  index,
+                                })
+                                setIsOpen(true)
+                              }}
+                            />
+                          </div>
+                        </Td>
+                        <Td>{row.fieldName}</Td>
+                        <Td>
+                          {dbSourceTypeOptions.find((a: any) => a.value === row.fieldDbType)?.label}
+                        </Td>
+                        <Td>{FieldCustomValueTypeEnum[row.customValueType]}</Td>
+                        <Td>{row.value}</Td>
+                        <Td className="break-all">{row.sqlQuery}</Td>
+                      </Tr>
+                    ))}
+                  </TBody>
+                </Table>
+              </Card>
+
               <Card
                 className="my-2"
                 header={translate('::ListForms.ListFormEdit.DatabasePreviewTSQL')}
@@ -105,98 +204,6 @@ function FormTabDatabaseUpdate({
           </Form>
         )}
       </Formik>
-      <Card
-        className="my-2"
-        bodyClass="p-0"
-        header={translate('::ListForms.ListFormEdit.DatabaseUpdateFieldsDefaultValues')}
-        headerExtra={translate(
-          '::ListForms.ListFormEdit.DatabaseUpdateFieldsDefaultValuesDescription',
-        )}
-      >
-        <Table compact>
-          <THead>
-            <Tr>
-              <Th className="text-center">
-                <Button
-                  shape="circle"
-                  variant="plain"
-                  type="button"
-                  size="xs"
-                  title="Add"
-                  icon={<FaFileMedical />}
-                  onClick={async (e) => {
-                    e.preventDefault()
-                    setData({
-                      tabName: ListFormEditTabs.Database.Update.UpdateFieldsDefaultValuesJsonRow,
-                      operation: 'create',
-                      id: initialValues.id ?? '',
-                      index: -1,
-                    })
-                    setIsOpen(true)
-                  }}
-                />
-              </Th>
-              <Th>{translate('::ListForms.ListFormFieldEdit.FieldName')}</Th>
-              <Th>{translate('::ListForms.ListFormEdit.FieldDbType')}</Th>
-              <Th>{translate('::ListForms.ListFormEdit.CustomValueType')}</Th>
-              <Th>{translate('::ListForms.ListFormEdit.Value')}</Th>
-              <Th>{translate('::ListForms.ListFormEdit.SqlQuery')}</Th>
-            </Tr>
-          </THead>
-          <TBody>
-            {initialValues.updateFieldsDefaultValueDto.map((row: any, index: number) => (
-              <Tr key={row.fieldName}>
-                <Td>
-                  <div className="flex-wrap inline-flex xl:flex items-center gap-2">
-                    <Button
-                      shape="circle"
-                      variant="plain"
-                      type="button"
-                      size="xs"
-                      title="Edit"
-                      icon={<FaEdit />}
-                      onClick={() => {
-                        setData({
-                          tabName:
-                            ListFormEditTabs.Database.Update.UpdateFieldsDefaultValuesJsonRow,
-                          operation: 'update',
-                          id: initialValues.id ?? '',
-                          index,
-                          crudValues: initialValues.updateFieldsDefaultValueDto[index],
-                        })
-                        setIsOpen(true)
-                      }}
-                    />
-                    <Button
-                      shape="circle"
-                      variant="plain"
-                      type="button"
-                      size="xs"
-                      title="Delete"
-                      icon={<FaTrash />}
-                      onClick={() => {
-                        setData({
-                          tabName:
-                            ListFormEditTabs.Database.Update.UpdateFieldsDefaultValuesJsonRow,
-                          operation: 'delete',
-                          id: initialValues.id ?? '',
-                          index,
-                        })
-                        setIsOpen(true)
-                      }}
-                    />
-                  </div>
-                </Td>
-                <Td>{row.fieldName}</Td>
-                <Td>{dbSourceTypeOptions.find((a: any) => a.value === row.fieldDbType)?.label}</Td>
-                <Td>{FieldCustomValueTypeEnum[row.customValueType]}</Td>
-                <Td>{row.value}</Td>
-                <Td className="break-all">{row.sqlQuery}</Td>
-              </Tr>
-            ))}
-          </TBody>
-        </Table>
-      </Card>
     </Container>
   )
 }
diff --git a/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogDatabase.tsx b/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogDatabase.tsx
index 59bb06de..3084a6cb 100644
--- a/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogDatabase.tsx
+++ b/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogDatabase.tsx
@@ -153,7 +153,7 @@ function JsonRowOpDialogDatabase({
                         type="text"
                         autoComplete="off"
                         name="fieldName"
-                        placeholder={translate('::ListForms.ListFormEdit.FieldName')}
+                        placeholder={translate('::ListForms.ListFormFieldEdit.FieldName')}
                         component={Input}
                       />
                     </FormItem>