diff --git a/app/DD-Record-Organizer/ClassControlCommandsUI.vb b/app/DD-Record-Organizer/ClassControlCommandsUI.vb
index 9b33680..f829259 100644
--- a/app/DD-Record-Organizer/ClassControlCommandsUI.vb
+++ b/app/DD-Record-Organizer/ClassControlCommandsUI.vb
@@ -808,7 +808,13 @@ Public Class ClassControlCommandsUI
             Case Else
                 Return Nothing
         End Select
+
     End Function
+    Public Class MyBaseClass
+    End Class
+
+    Public Class MyDerivedClass : Inherits MyBaseClass
+    End Class
     Public Shared Function Check_and_Format_Value(ControlID As Integer, RecordID As Integer, Value As String)
         Try
             Dim expression As String
@@ -822,8 +828,15 @@ Public Class ClassControlCommandsUI
                 FORMAT_TYPE = CONTROL_ROW(i)("FORMAT_TYPE")
                 CONTROL_TYPE = CONTROL_ROW(i)("CONTROL_TYPE_ID")
             Next
+            If CONTROL_TYPE = 0 And FORMAT_TYPE Is Nothing Then
+                If IsDate(Value) Then
+                    CONTROL_TYPE = 4
 
-            Select Case FORMAT_TYPE
+                End If
+
+            End If
+
+                Select Case FORMAT_TYPE
                 Case "Currency"
                     If Not Value = String.Empty Then
                         Value = Decimal.Parse(Value, Globalization.NumberStyles.Currency).ToString
diff --git a/app/DD-Record-Organizer/ClassRecordCommands.vb b/app/DD-Record-Organizer/ClassRecordCommands.vb
index bfaf1c0..1eabe30 100644
--- a/app/DD-Record-Organizer/ClassRecordCommands.vb
+++ b/app/DD-Record-Organizer/ClassRecordCommands.vb
@@ -22,7 +22,10 @@ Public Class ClassRecordCommands
 
                 Dim GUID As Integer = cmd.Parameters("@pRESULT").Value
                 If GUID > 0 And clsDatabase.DB_PROXY_INITIALIZED = True Then
-                    ClassProxy.PRPROXY_CONTROL_VALUE_RENEW(GUID)
+                    If ClassProxy.PRPROXY_RECORD_UPD_INS(formId, GUID) = True Then
+                           ClassProxy.PRPROXY_CONTROL_VALUE_RENEW(GUID)
+                    End If
+
                 End If
                 Return GUID
             End Using
diff --git a/app/RecordOrganizer_RightManager/ClassDatabase.vb b/app/RecordOrganizer_RightManager/ClassDatabase.vb
index f4231d1..72c6c2d 100644
--- a/app/RecordOrganizer_RightManager/ClassDatabase.vb
+++ b/app/RecordOrganizer_RightManager/ClassDatabase.vb
@@ -48,6 +48,7 @@ Public Class ClassDatabase
             SQLconnect.Open()
             SQLcommand = SQLconnect.CreateCommand
             SQLcommand.CommandText = Select_anweisung
+            SQLcommand.CommandTimeout = 600
 
             Dim adapter1 As SqlClient.SqlDataAdapter = New SqlClient.SqlDataAdapter(SQLcommand)
             Dim dt As DataTable = New DataTable()
@@ -81,6 +82,7 @@ Public Class ClassDatabase
                 SQLconnect.Open()
                 SQLcommand = SQLconnect.CreateCommand
                 SQLcommand.CommandText = sql
+                SQLcommand.CommandTimeout = 600
 
                 Dim adapter1 As SqlClient.SqlDataAdapter = New SqlClient.SqlDataAdapter(SQLcommand)
                 Dim dt As DataTable = New DataTable()
@@ -105,6 +107,7 @@ Public Class ClassDatabase
             SQLconnect.Open()
             SQLcommand = SQLconnect.CreateCommand
             SQLcommand.CommandText = Select_anweisung
+            SQLcommand.CommandTimeout = 600
 
             Dim adapter1 As SqlClient.SqlDataAdapter = New SqlClient.SqlDataAdapter(SQLcommand)
             Dim dt As DataTable = New DataTable()
@@ -133,6 +136,7 @@ Public Class ClassDatabase
                 SQLconnect.Open()
                 SQLcommand = SQLconnect.CreateCommand
                 SQLcommand.CommandText = Select_anweisung
+                SQLcommand.CommandTimeout = 600
 
                 Dim adapter1 As SqlClient.SqlDataAdapter = New SqlClient.SqlDataAdapter(SQLcommand)
                 Dim dt As DataTable = New DataTable()
@@ -164,6 +168,7 @@ Public Class ClassDatabase
             SQLcommand.CommandTimeout = timeout
             'Update Last Created Record in Foo
             SQLcommand.CommandText = ExecuteCMD
+            SQLcommand.CommandTimeout = 600
 
             SQLcommand.ExecuteNonQuery()
             SQLcommand.Dispose()
@@ -186,6 +191,7 @@ Public Class ClassDatabase
                 SQLcommand = SQLconnect.CreateCommand
                 'Update Last Created Record in Foo
                 SQLcommand.CommandText = ExecuteCMD
+                SQLcommand.CommandTimeout = 600
                 SQLcommand.ExecuteNonQuery()
                 SQLcommand.Dispose()
                 SQLconnect.Close()
@@ -210,6 +216,7 @@ Public Class ClassDatabase
             SQLconnect.ConnectionString = ConnectionStringRM
             SQLconnect.Open()
             SQLcommand = SQLconnect.CreateCommand
+            SQLcommand.CommandTimeout = 600
             'Update Last Created Record in Foo
             SQLcommand.CommandText = cmdscalar
             result = SQLcommand.ExecuteScalar()
@@ -240,6 +247,7 @@ Public Class ClassDatabase
                 SQLcommand = SQLconnect.CreateCommand
                 'Update Last Created Record in Foo
                 SQLcommand.CommandText = cmdscalar
+                SQLcommand.CommandTimeout = 600
                 result = SQLcommand.ExecuteScalar()
                 SQLcommand.Dispose()
                 SQLconnect.Close()