diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb
index b8f728b..eb64f32 100644
--- a/app/DD-Record-Organiser/frmConstructor_Main.vb
+++ b/app/DD-Record-Organiser/frmConstructor_Main.vb
@@ -4441,12 +4441,14 @@ Public Class frmConstructor_Main
 
                 If DT_RESULT.Rows.Count > 0 Then
 
-                    ClassWindreamDocGrid.FormatColumns(
-                        GridViewDoc_Search,
-                        DT_RESULT,
-                        DT_WINDREAM_RESULTLIST,
-                        DT_DOCRESULT_DROPDOWN_ITEMS,
-                        AddressOf OnCBSelectedValueChanged)
+                    ClassWindreamDocGrid.FillColumns(
+                       GridViewDoc_Search,
+                       DT_RESULT,
+                       DT_WINDREAM_RESULTLIST,
+                       DT_DOCRESULT_DROPDOWN_ITEMS,
+                       AddressOf OnCBSelectedValueChanged,
+                       AddressOf OnDateSelectedValueChanged,
+                       AddressOf OnTextSelectedValueChanged)
 
                     If TCDetails.SelectedTabPageIndex <> 1 Then
                         TCDetails.SelectedTabPageIndex = 1
@@ -4668,12 +4670,45 @@ Public Class frmConstructor_Main
             Dim docId As Integer = ClassWindreamDocGrid.RESULT_DOC_ID
             Dim user As String = Environment.UserName
 
-            Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE {0}, {1}, '{2}', '{3}'", docId, configId, value, Environment.UserName)
+            Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE {0}, {1}, '{2}', '{3}'", docId, configId, value, user)
             ClassDatabase.Execute_non_Query(Sql)
         Catch ex As Exception
-            MsgBox("Error:" & vbNewLine & ex.Message)
+            MsgBox("Error in OnCBSelectedValueChanged:" & vbNewLine & ex.Message)
+        End Try
+    End Sub
+
+    Private Sub OnDateSelectedValueChanged(sender As Object, e As EventArgs)
+        Try
+            Dim DatePicker As DateEdit = sender
+            Dim value As DateTime = DatePicker.EditValue
+            Dim colTitle = DirectCast(GridControlDocSearch.MainView, DevExpress.XtraGrid.Views.Grid.GridView).FocusedColumn.FieldName
+            Dim configId As Integer = ClassWindreamDocGrid.RESULT_CONFIG_IDS.Item(colTitle)
+            Dim docId As Integer = ClassWindreamDocGrid.RESULT_DOC_ID
+            Dim user As String = Environment.UserName
+
+            Dim dateString = value.ToString("yyyy-MM-dd hh:mm:ss.fff")
+
+            Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE {0}, {1}, '{2}', '{3}'", docId, configId, dateString, user)
+            ClassDatabase.Execute_non_Query(Sql)
+        Catch ex As Exception
+            MsgBox("Error in OnDateSelectedValueChanged:" & vbNewLine & ex.Message)
+        End Try
+    End Sub
+
+    Private Sub OnTextSelectedValueChanged(sender As Object, e As EventArgs)
+        Try
+            Dim TextBox As TextEdit = sender
+            Dim value = TextBox.EditValue
+            Dim colTitle = DirectCast(GridControlDocSearch.MainView, DevExpress.XtraGrid.Views.Grid.GridView).FocusedColumn.FieldName
+            Dim configId As Integer = ClassWindreamDocGrid.RESULT_CONFIG_IDS.Item(colTitle)
+            Dim docId As Integer = ClassWindreamDocGrid.RESULT_DOC_ID
+            Dim user As String = Environment.UserName
+
+            Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE {0}, {1}, '{2}', '{3}'", docId, configId, value, user)
+            ClassDatabase.Execute_non_Query(Sql)
+        Catch ex As Exception
+            MsgBox("Error in OnTextSelectedValueChanged:" & vbNewLine & ex.Message)
         End Try
-        'Perform your actions
     End Sub
 
     Public Class WDDoc_Combobox_Item