diff --git a/.vscode/launch.json b/.vscode/launch.json
index 379d2046..f994e0f9 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -49,7 +49,7 @@
         "AYANOVA_USE_URLS": "http://*:7575;",
         "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
         "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",       
-        "AYANOVA_SERVER_TEST_MODE":"false",
+        "AYANOVA_SERVER_TEST_MODE":"true",
         "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL":"small",
         "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET":"-7",
         "AYANOVA_BACKUP_PG_DUMP_PATH":"C:\\data\\code\\PostgreSQLPortable_12.0\\App\\PgSQL\\bin\\"
diff --git a/server/AyaNova/biz/Search.cs b/server/AyaNova/biz/Search.cs
index 630e2be7..dc39d49b 100644
--- a/server/AyaNova/biz/Search.cs
+++ b/server/AyaNova/biz/Search.cs
@@ -654,8 +654,8 @@ namespace AyaNova.Biz
         {
             //Be careful in future, if you put ToString at the end of each object in the string interpolation
             //npgsql driver will assume it's a string and put quotes around it triggering an error that a string can't be compared to an int
-            AyContext ct = ServiceProviderProvider.DBContext;
-            await ct.Database.ExecuteSqlInterpolatedAsync($"delete from asearchkey where objectid={objectID} and objecttype={(int)objectType}");
+            using (AyContext ct = ServiceProviderProvider.DBContext)
+                await ct.Database.ExecuteSqlInterpolatedAsync($"delete from asearchkey where objectid={objectID} and objecttype={(int)objectType}");
             //nothing to save here, it's a direct command already executed
         }
 
@@ -673,7 +673,8 @@ namespace AyaNova.Biz
 
             if (KeyWordList.Count == 0) return;
             //call stored procedure to do the work right at the server (fastest method by far)
-            var SomeValue = await ServiceProviderProvider.DBContext.Database.ExecuteSqlInterpolatedAsync($"call aydosearchindex({KeyWordList},{p.ObjectId},{p.ObjectType},{!newRecord})");
+            using (AyContext ct = ServiceProviderProvider.DBContext)
+                await ct.Database.ExecuteSqlInterpolatedAsync($"call aydosearchindex({KeyWordList},{p.ObjectId},{p.ObjectType},{!newRecord})");
             return;
         }//eoc
         #endregion
diff --git a/server/AyaNova/generator/CoreJobMetricsSnapshot.cs b/server/AyaNova/generator/CoreJobMetricsSnapshot.cs
index 94d49ff5..9b4d53f4 100644
--- a/server/AyaNova/generator/CoreJobMetricsSnapshot.cs
+++ b/server/AyaNova/generator/CoreJobMetricsSnapshot.cs
@@ -148,6 +148,7 @@ namespace AyaNova.Biz
                 using (AyContext ct = ServiceProviderProvider.DBContext)
                 {
                      ct.Database.ExecuteSqlInterpolated($"delete from ametricmm where t < {ClearDate.ToUniversalTime()}");
+                     ct.Database.ExecuteSqlInterpolated($"delete from ametricdd where t < {ClearDate.ToUniversalTime()}");
                 }
                 _lastDDSnapshot = now;
             }
diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs
index e7b8b367..ec36abca 100644
--- a/server/AyaNova/util/AySchema.cs
+++ b/server/AyaNova/util/AySchema.cs
@@ -22,7 +22,7 @@ namespace AyaNova.Util
         //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!!
         private const int DESIRED_SCHEMA_LEVEL = 11;
 
-        internal const long EXPECTED_COLUMN_COUNT = 328;
+        internal const long EXPECTED_COLUMN_COUNT = 323;
         internal const long EXPECTED_INDEX_COUNT = 134;
 
         //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!!