diff --git a/.vscode/launch.json b/.vscode/launch.json
index 0e2049e9..d7b2b92a 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -53,8 +53,8 @@
         "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
         "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
         "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles",
-        "AYANOVA_SERVER_TEST_MODE": "false",
-        "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",
+        "AYANOVA_SERVER_TEST_MODE": "true",
+        "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "hug",
         "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7",
         "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\"
       },
diff --git a/server/AyaNova/DataList/UnitDataList.cs b/server/AyaNova/DataList/UnitDataList.cs
index 3403fa85..dd839d93 100644
--- a/server/AyaNova/DataList/UnitDataList.cs
+++ b/server/AyaNova/DataList/UnitDataList.cs
@@ -10,10 +10,10 @@ namespace AyaNova.DataList
             DefaultListObjectType = AyaType.Unit;
             SQLFrom = "from aunit "
                       + "left outer join acustomer on (aunit.customerid=acustomer.id) "
-                      + "left outer join aunit as aparentunit on (aunit.parentunitid=aunit.id) "
-                      + "left outer join aunitmodel on (aunit.unitmodelid=aunitmodel.id) "
-                      + "left outer join avendor on (aunit.purchasedfromvendorid=avendor.id) "
-                      + "left outer join aunit as areplacedbyunit on (aunit.replacedbyunitid=aunit.id) ";
+                      + "left outer join aunit as aparentunit on (aunit.parentunitid=aunit.id and aunit.parentunitid <> null) "
+                      + "left outer join aunitmodel on (aunit.unitmodelid=aunitmodel.id  and aunit.unitmodelid <> null) "
+                      + "left outer join avendor on (aunit.purchasedfromvendorid=avendor.id and aunit.purchasedfromvendorid <> null) "
+                      + "left outer join aunit as areplacedbyunit on (aunit.replacedbyunitid=aunit.id and aunit.replacedbyunitid <> null) ";
             var RoleSet = BizRoles.GetRoleSet(DefaultListObjectType);
             AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change;