diff --git a/app/DD_PM_WINDREAM/ModuleControlProperties.vb b/app/DD_PM_WINDREAM/ModuleControlProperties.vb
index b02dc0b..1319360 100644
--- a/app/DD_PM_WINDREAM/ModuleControlProperties.vb
+++ b/app/DD_PM_WINDREAM/ModuleControlProperties.vb
@@ -85,7 +85,6 @@ Public Module ModuleControlProperties
         Private _index_type As String
         Private _sql_command As String
         Friend _sql_connection As Integer = 0
-        Private _Override_SQL As String
         Private _Enable_SQL As String
         Private _Enable_SQL_ONLOAD As String
         Private _default_value
@@ -102,6 +101,7 @@ Public Module ModuleControlProperties
         Public Property [ReadOnly]() As Boolean
 
         <DisplayName("Save Changes On Read Only")>
+        <Description("Stores data of Read Only fields when document is saved. Default behaviour is NOT to save Read Only fields.")>
         <Category(ClassConstants.CAT_BEHAVIOUR)>
         Public Property [SaveChangeOnReadOnly]() As Boolean
 
@@ -144,19 +144,8 @@ Public Module ModuleControlProperties
             End Set
         End Property
 
-        <DisplayName("Completion Override SQL")>
-        <Category(ClassConstants.CAT_VALIDATION)>
-        Public Property Override_SQL() As SQLValue
-            Get
-                Return New SQLValue(NotNull(_Override_SQL, ""), _sql_connection)
-            End Get
-            Set(ByVal value As SQLValue)
-                _Override_SQL = value.Value
-                SQLConnection = value.ConnectionId
-            End Set
-        End Property
-
         <DisplayName("Enable On Change SQL")>
+        <Description("SQL Command that determines if a control should be enabled/disabled when another, referenced control changes. Should return 0 or 1. Can include a Control-Placeholder.")>
         <Category(ClassConstants.CAT_BEHAVIOUR)>
         Public Property Enable_SQL() As SQLValue
             Get
@@ -169,6 +158,7 @@ Public Module ModuleControlProperties
         End Property
 
         <DisplayName("Enable On Load SQL")>
+        <Description("SQL Command that determines if a control should be enabled/disabled when the form loads. Should return 0 or 1. Can include a Control-Placeholder.")>
         <Category(ClassConstants.CAT_BEHAVIOUR)>
         Public Property Enable_SQL_OnLoad() As SQLValue
             Get
@@ -298,7 +288,7 @@ Public Module ModuleControlProperties
         Inherits InputProperties
 
         Private _image_Value As String
-
+        Private _Override_SQL As String
 
         <Category(ClassConstants.CAT_DISPLAY)>
         Public Property Text() As String
@@ -313,6 +303,18 @@ Public Module ModuleControlProperties
                 _image_Value = value.Value
             End Set
         End Property
+
+        <DisplayName("Completion Override SQL")>
+        <Category(ClassConstants.CAT_VALIDATION)>
+        Public Property Override_SQL() As SQLValue
+            Get
+                Return New SQLValue(NotNull(_Override_SQL, ""), _sql_connection)
+            End Get
+            Set(ByVal value As SQLValue)
+                _Override_SQL = value.Value
+                SQLConnection = value.ConnectionId
+            End Set
+        End Property
     End Class
 
     Public Class LookupControlProperties