diff --git a/src/Microsoft.SqlTools.SqlCore/ObjectExplorer/SmoModel/SmoTreeNodes.cs b/src/Microsoft.SqlTools.SqlCore/ObjectExplorer/SmoModel/SmoTreeNodes.cs
index b1bc9d1342..bf92e2b6d1 100644
--- a/src/Microsoft.SqlTools.SqlCore/ObjectExplorer/SmoModel/SmoTreeNodes.cs
+++ b/src/Microsoft.SqlTools.SqlCore/ObjectExplorer/SmoModel/SmoTreeNodes.cs
@@ -807,6 +807,13 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
     						Description = SR.FilterSchemaDescription,
     					},
     					new NodeFilterProperty
+    					{
+    						Name = "CreateDate",
+    						DisplayName = SR.FilterCreateDate,
+    						Type = NodeFilterPropertyDataType.Date,
+    						Description = SR.FilterCreateDateDescription,
+    					},
+    					new NodeFilterProperty
     					{
     						Name = "Owner",
     						DisplayName = SR.FilterOwner,
@@ -837,13 +844,6 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
     						Type = NodeFilterPropertyDataType.Boolean,
     						Description = SR.FilterIsMemoryOptimizedDescription,
     					},
-    					new NodeFilterProperty
-    					{
-    						Name = "CreateDate",
-    						DisplayName = SR.FilterCreateDate,
-    						Type = NodeFilterPropertyDataType.Date,
-    						Description = SR.FilterCreateDateDescription,
-    					},
                 	}
                 });
 			}
@@ -871,19 +871,19 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
     						Description = SR.FilterSchemaDescription,
     					},
     					new NodeFilterProperty
-    					{
-    						Name = "Owner",
-    						DisplayName = SR.FilterOwner,
-    						Type = NodeFilterPropertyDataType.String,
-    						Description = SR.FilterOwnerDescription,
-    					},
-    					new NodeFilterProperty
     					{
     						Name = "CreateDate",
     						DisplayName = SR.FilterCreateDate,
     						Type = NodeFilterPropertyDataType.Date,
     						Description = SR.FilterCreateDateDescription,
     					},
+    					new NodeFilterProperty
+    					{
+    						Name = "Owner",
+    						DisplayName = SR.FilterOwner,
+    						Type = NodeFilterPropertyDataType.String,
+    						Description = SR.FilterOwnerDescription,
+    					},
                 	}
                 });
 			}
@@ -1081,6 +1081,13 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
 						Description = SR.FilterSchemaDescription,
 					},
 					new NodeFilterProperty
+					{
+						Name = "CreateDate",
+						DisplayName = SR.FilterCreateDate,
+						Type = NodeFilterPropertyDataType.Date,
+						Description = SR.FilterCreateDateDescription,
+					},
+					new NodeFilterProperty
 					{
 						Name = "Owner",
 						DisplayName = SR.FilterOwner,
@@ -1111,13 +1118,6 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
 						Type = NodeFilterPropertyDataType.Boolean,
 						Description = SR.FilterIsMemoryOptimizedDescription,
 					},
-					new NodeFilterProperty
-					{
-						Name = "CreateDate",
-						DisplayName = SR.FilterCreateDate,
-						Type = NodeFilterPropertyDataType.Date,
-						Description = SR.FilterCreateDateDescription,
-					},
             	}
             });
             currentChildren.Add(new FolderNode {
@@ -1142,19 +1142,19 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
 						Description = SR.FilterSchemaDescription,
 					},
 					new NodeFilterProperty
-					{
-						Name = "Owner",
-						DisplayName = SR.FilterOwner,
-						Type = NodeFilterPropertyDataType.String,
-						Description = SR.FilterOwnerDescription,
-					},
-					new NodeFilterProperty
 					{
 						Name = "CreateDate",
 						DisplayName = SR.FilterCreateDate,
 						Type = NodeFilterPropertyDataType.Date,
 						Description = SR.FilterCreateDateDescription,
 					},
+					new NodeFilterProperty
+					{
+						Name = "Owner",
+						DisplayName = SR.FilterOwner,
+						Type = NodeFilterPropertyDataType.String,
+						Description = SR.FilterOwnerDescription,
+					},
             	}
             });
             currentChildren.Add(new FolderNode {
@@ -1310,6 +1310,13 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
 						Description = SR.FilterSchemaDescription,
 					},
 					new NodeFilterProperty
+					{
+						Name = "CreateDate",
+						DisplayName = SR.FilterCreateDate,
+						Type = NodeFilterPropertyDataType.Date,
+						Description = SR.FilterCreateDateDescription,
+					},
+					new NodeFilterProperty
 					{
 						Name = "Owner",
 						DisplayName = SR.FilterOwner,
@@ -1340,13 +1347,6 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
 						Type = NodeFilterPropertyDataType.Boolean,
 						Description = SR.FilterIsMemoryOptimizedDescription,
 					},
-					new NodeFilterProperty
-					{
-						Name = "CreateDate",
-						DisplayName = SR.FilterCreateDate,
-						Type = NodeFilterPropertyDataType.Date,
-						Description = SR.FilterCreateDateDescription,
-					},
             	}
             });
             currentChildren.Add(new FolderNode {
@@ -1372,6 +1372,13 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
 						Description = SR.FilterSchemaDescription,
 					},
 					new NodeFilterProperty
+					{
+						Name = "CreateDate",
+						DisplayName = SR.FilterCreateDate,
+						Type = NodeFilterPropertyDataType.Date,
+						Description = SR.FilterCreateDateDescription,
+					},
+					new NodeFilterProperty
 					{
 						Name = "Owner",
 						DisplayName = SR.FilterOwner,
@@ -1402,13 +1409,6 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
 						Type = NodeFilterPropertyDataType.Boolean,
 						Description = SR.FilterIsMemoryOptimizedDescription,
 					},
-					new NodeFilterProperty
-					{
-						Name = "CreateDate",
-						DisplayName = SR.FilterCreateDate,
-						Type = NodeFilterPropertyDataType.Date,
-						Description = SR.FilterCreateDateDescription,
-					},
             	}
             });
         }
@@ -1504,19 +1504,19 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
 						Description = SR.FilterSchemaDescription,
 					},
 					new NodeFilterProperty
-					{
-						Name = "Owner",
-						DisplayName = SR.FilterOwner,
-						Type = NodeFilterPropertyDataType.String,
-						Description = SR.FilterOwnerDescription,
-					},
-					new NodeFilterProperty
 					{
 						Name = "CreateDate",
 						DisplayName = SR.FilterCreateDate,
 						Type = NodeFilterPropertyDataType.Date,
 						Description = SR.FilterCreateDateDescription,
 					},
+					new NodeFilterProperty
+					{
+						Name = "Owner",
+						DisplayName = SR.FilterOwner,
+						Type = NodeFilterPropertyDataType.String,
+						Description = SR.FilterOwnerDescription,
+					},
             	}
             });
         }
@@ -1593,6 +1593,13 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
     						Description = SR.FilterSchemaDescription,
     					},
     					new NodeFilterProperty
+    					{
+    						Name = "CreateDate",
+    						DisplayName = SR.FilterCreateDate,
+    						Type = NodeFilterPropertyDataType.Date,
+    						Description = SR.FilterCreateDateDescription,
+    					},
+    					new NodeFilterProperty
     					{
     						Name = "Owner",
     						DisplayName = SR.FilterOwner,
@@ -1606,13 +1613,6 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
     						Type = NodeFilterPropertyDataType.Boolean,
     						Description = SR.FilterIsNativelyCompiledDescription,
     					},
-    					new NodeFilterProperty
-    					{
-    						Name = "CreateDate",
-    						DisplayName = SR.FilterCreateDate,
-    						Type = NodeFilterPropertyDataType.Date,
-    						Description = SR.FilterCreateDateDescription,
-    					},
                 	}
                 });
 			}
@@ -1675,19 +1675,19 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
     						Description = SR.FilterSchemaDescription,
     					},
     					new NodeFilterProperty
-    					{
-    						Name = "Owner",
-    						DisplayName = SR.FilterOwner,
-    						Type = NodeFilterPropertyDataType.String,
-    						Description = SR.FilterOwnerDescription,
-    					},
-    					new NodeFilterProperty
     					{
     						Name = "CreateDate",
     						DisplayName = SR.FilterCreateDate,
     						Type = NodeFilterPropertyDataType.Date,
     						Description = SR.FilterCreateDateDescription,
     					},
+    					new NodeFilterProperty
+    					{
+    						Name = "Owner",
+    						DisplayName = SR.FilterOwner,
+    						Type = NodeFilterPropertyDataType.String,
+    						Description = SR.FilterOwnerDescription,
+    					},
                 	}
                 });
 			}
@@ -1732,6 +1732,13 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
 						Description = SR.FilterSchemaDescription,
 					},
 					new NodeFilterProperty
+					{
+						Name = "CreateDate",
+						DisplayName = SR.FilterCreateDate,
+						Type = NodeFilterPropertyDataType.Date,
+						Description = SR.FilterCreateDateDescription,
+					},
+					new NodeFilterProperty
 					{
 						Name = "Owner",
 						DisplayName = SR.FilterOwner,
@@ -1745,13 +1752,6 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
 						Type = NodeFilterPropertyDataType.Boolean,
 						Description = SR.FilterIsNativelyCompiledDescription,
 					},
-					new NodeFilterProperty
-					{
-						Name = "CreateDate",
-						DisplayName = SR.FilterCreateDate,
-						Type = NodeFilterPropertyDataType.Date,
-						Description = SR.FilterCreateDateDescription,
-					},
             	}
             });
             currentChildren.Add(new FolderNode {
@@ -1791,19 +1791,19 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
 						Description = SR.FilterSchemaDescription,
 					},
 					new NodeFilterProperty
-					{
-						Name = "Owner",
-						DisplayName = SR.FilterOwner,
-						Type = NodeFilterPropertyDataType.String,
-						Description = SR.FilterOwnerDescription,
-					},
-					new NodeFilterProperty
 					{
 						Name = "CreateDate",
 						DisplayName = SR.FilterCreateDate,
 						Type = NodeFilterPropertyDataType.Date,
 						Description = SR.FilterCreateDateDescription,
 					},
+					new NodeFilterProperty
+					{
+						Name = "Owner",
+						DisplayName = SR.FilterOwner,
+						Type = NodeFilterPropertyDataType.String,
+						Description = SR.FilterOwnerDescription,
+					},
             	}
             });
         }
@@ -2915,6 +2915,13 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
 						Description = SR.FilterSchemaDescription,
 					},
 					new NodeFilterProperty
+					{
+						Name = "CreateDate",
+						DisplayName = SR.FilterCreateDate,
+						Type = NodeFilterPropertyDataType.Date,
+						Description = SR.FilterCreateDateDescription,
+					},
+					new NodeFilterProperty
 					{
 						Name = "Owner",
 						DisplayName = SR.FilterOwner,
@@ -2928,13 +2935,6 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
 						Type = NodeFilterPropertyDataType.Boolean,
 						Description = SR.FilterIsNativelyCompiledDescription,
 					},
-					new NodeFilterProperty
-					{
-						Name = "CreateDate",
-						DisplayName = SR.FilterCreateDate,
-						Type = NodeFilterPropertyDataType.Date,
-						Description = SR.FilterCreateDateDescription,
-					},
             	}
             });
             currentChildren.Add(new FolderNode {
@@ -2959,6 +2959,13 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
 						Description = SR.FilterSchemaDescription,
 					},
 					new NodeFilterProperty
+					{
+						Name = "CreateDate",
+						DisplayName = SR.FilterCreateDate,
+						Type = NodeFilterPropertyDataType.Date,
+						Description = SR.FilterCreateDateDescription,
+					},
+					new NodeFilterProperty
 					{
 						Name = "Owner",
 						DisplayName = SR.FilterOwner,
@@ -2972,13 +2979,6 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
 						Type = NodeFilterPropertyDataType.Boolean,
 						Description = SR.FilterIsNativelyCompiledDescription,
 					},
-					new NodeFilterProperty
-					{
-						Name = "CreateDate",
-						DisplayName = SR.FilterCreateDate,
-						Type = NodeFilterPropertyDataType.Date,
-						Description = SR.FilterCreateDateDescription,
-					},
             	}
             });
             currentChildren.Add(new FolderNode {
@@ -3004,19 +3004,19 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
 						Description = SR.FilterSchemaDescription,
 					},
 					new NodeFilterProperty
-					{
-						Name = "Owner",
-						DisplayName = SR.FilterOwner,
-						Type = NodeFilterPropertyDataType.String,
-						Description = SR.FilterOwnerDescription,
-					},
-					new NodeFilterProperty
 					{
 						Name = "CreateDate",
 						DisplayName = SR.FilterCreateDate,
 						Type = NodeFilterPropertyDataType.Date,
 						Description = SR.FilterCreateDateDescription,
 					},
+					new NodeFilterProperty
+					{
+						Name = "Owner",
+						DisplayName = SR.FilterOwner,
+						Type = NodeFilterPropertyDataType.String,
+						Description = SR.FilterOwnerDescription,
+					},
             	}
             });
         }
diff --git a/src/Microsoft.SqlTools.SqlCore/ObjectExplorer/SmoModel/SmoTreeNodesDefinition.xml b/src/Microsoft.SqlTools.SqlCore/ObjectExplorer/SmoModel/SmoTreeNodesDefinition.xml
index 3b5b2d7768..a4aa1fd4cc 100644
--- a/src/Microsoft.SqlTools.SqlCore/ObjectExplorer/SmoModel/SmoTreeNodesDefinition.xml
+++ b/src/Microsoft.SqlTools.SqlCore/ObjectExplorer/SmoModel/SmoTreeNodesDefinition.xml
@@ -573,80 +573,80 @@
   <FilterProperties NodeName="Tables">
     <Property>Name</Property>
     <Property>Schema</Property>
+    <Property>CreateDate</Property>
     <Property>Owner</Property>
     <Property>Durability</Property>
     <Property>IsMemoryOptimized</Property>
-    <Property>CreateDate</Property>
   </FilterProperties>
 
   <FilterProperties NodeName="SystemTables">
     <Property>Name</Property>
     <Property>Schema</Property>
+    <Property>CreateDate</Property>
     <Property>Owner</Property>
     <Property>Durability</Property>
     <Property>IsMemoryOptimized</Property>
-    <Property>CreateDate</Property>
   </FilterProperties>
 
   <FilterProperties NodeName="DroppedLedgerTables">
     <Property>Name</Property>
     <Property>Schema</Property>
+    <Property>CreateDate</Property>
     <Property>Owner</Property>
     <Property>Durability</Property>
     <Property>IsMemoryOptimized</Property>
-    <Property>CreateDate</Property>
   </FilterProperties>
   
   <FilterProperties NodeName="Views">
     <Property>Name</Property>
     <Property>Schema</Property>
-    <Property>Owner</Property>
     <Property>CreateDate</Property>
+    <Property>Owner</Property>
   </FilterProperties>
 
   <FilterProperties NodeName="DroppedLedgerViews">
     <Property>Name</Property>
     <Property>Schema</Property>
-    <Property>Owner</Property>
     <Property>CreateDate</Property>
+    <Property>Owner</Property>
   </FilterProperties>
 
   <FilterProperties NodeName="StoredProcedures">
     <Property>Name</Property>
     <Property>Schema</Property>
+    <Property>CreateDate</Property>
     <Property>Owner</Property>
     <Property>IsNativelyCompiled</Property>
-    <Property>CreateDate</Property>
   </FilterProperties>
 
   <FilterProperties NodeName="TableValuedFunctions">
     <Property>Name</Property>
     <Property>Schema</Property>
+    <Property>CreateDate</Property>
     <Property>Owner</Property>
     <Property>IsNativelyCompiled</Property>
-    <Property>CreateDate</Property>
   </FilterProperties>
 
   <FilterProperties NodeName="ScalarValuedFunctions">
     <Property>Name</Property>
     <Property>Schema</Property>
+    <Property>CreateDate</Property>
     <Property>Owner</Property>
     <Property>IsNativelyCompiled</Property>
-    <Property>CreateDate</Property>
   </FilterProperties>
 
   <FilterProperties NodeName="AggregateFunctions">
     <Property>Name</Property>
     <Property>Schema</Property>
-    <Property>Owner</Property>
     <Property>CreateDate</Property>
+    <Property>Owner</Property>
   </FilterProperties>
 
   <FilterProperties NodeName="Sequences">
     <Property>Name</Property>
     <Property>Schema</Property>
-    <Property>Owner</Property>
     <Property>CreateDate</Property>
+    <Property>Owner</Property>
   </FilterProperties>
 
   <FilterProperties NodeName="Indexes">