diff --git a/comps/list/TableList.tsx b/comps/list/TableList.tsx
index 32961ee..c827247 100755
--- a/comps/list/TableList.tsx
+++ b/comps/list/TableList.tsx
@@ -611,6 +611,7 @@ export const TableList: FC<TableListProp> = ({
                     "c-flex c-items-center c-cursor-pointer"
                   )}
                   onClick={(e) => {
+                    console.log(props.row);
                     if (!local.pk) return;
                     if (props?.row?.__children?.length > 0) {
                       e.stopPropagation();
@@ -641,7 +642,7 @@ export const TableList: FC<TableListProp> = ({
                     )}
                   </div>
                   {props.row?.__parent &&
-                    props.row?.__children?.length === 0 && (
+                    (props.row?.__children || []).length === 0 && (
                       <div
                         className={cx(
                           " c-border-l c-border-b c-border-black c-w-[10px] c-h-[15px]",
diff --git a/comps/list/utils/sort-tree.ts b/comps/list/utils/sort-tree.ts
index 5badca8..0a1bcb1 100755
--- a/comps/list/utils/sort-tree.ts
+++ b/comps/list/utils/sort-tree.ts
@@ -42,53 +42,88 @@ export const treePrefix = (props: any) => {
   }
   return prefix;
 };
+
 export const sortTree = (list: any[], parent_key: string, pk: string) => {
   const nodes: { [id: string]: any } = {};
+  const result: any[] = [];
 
-  // First pass: Create nodes
   list.forEach((node) => {
     const id = node[pk];
-    nodes[id] = { ...node, __depth: 0, __children: [], __parent: null };
+    nodes[id] = { ...node, __depth: 0, __children: [] };
   });
 
-  // Second pass: Build relationships
-  list.forEach((node) => {
+  let mode = "";
+  const final = list;
+  // .sort((a, b) => {
+  //   if (!mode) mode = typeof a[pk];
+  //   if (mode === "string")
+  //     return (a?.[parent_key] || "").localeCompare(b?.[parent_key] || "");
+  //   return (a?.[parent_key] || 0) - (b?.[parent_key] || 0);
+  // });
+
+  final.forEach((node, idx) => {
     const id = node[pk];
     const parentId = node[parent_key];
-    
-    if (parentId && parentId !== id && nodes[parentId]) {
-      nodes[id].__parent = nodes[parentId];
-      nodes[parentId].__children.push(nodes[id]);
+
+    if (parentId === null || parentId === undefined) {
+      result.push(nodes[id]);
+    } else {
+      if (nodes[parentId]) {
+        nodes[parentId].__children.push(nodes[id]);
+      } else {
+        // Handle the case where a parent is missing
+        result.push(nodes[id]);
+      }
     }
   });
 
-  // Function to calculate depth
-  const calculateDepth = (node: any, visited: Set<string> = new Set()): number => {
-    if (visited.has(node.id)) return 0; // Prevent cycles
-    visited.add(node.id);
-    
-    if (!node.__parent) return 0;
-    return 1 + calculateDepth(node.__parent, visited);
-  };
+  const added = new Set<any>();
 
-  // Calculate depths
-  Object.values(nodes).forEach((node: any) => {
-    node.__depth = calculateDepth(node);
-  });
+  // Function to flatten the tree
+  function flattenTree(
+    node: any,
+    depth: number = 0,
+    parent: any = null
+  ): any[] {
+    node.__depth = depth;
+    const children = node.__children || [];
+    node.__parent = parent;
 
-  // Sort nodes
-  const sortedNodes = Object.values(nodes).sort((a: any, b: any) => {
-    if (a.__depth !== b.__depth) return a.__depth - b.__depth;
-    if (a.__children.length !== b.__children.length) {
-      return b.__children.length - a.__children.length;
+    if (!added.has(node[pk])) {
+      added.add(node[pk]);
     }
-    return a.name.localeCompare(b.name);
-  });
 
-  // Assign indices
-  sortedNodes.forEach((node: any, index: number) => {
+    return [
+      node,
+      ...children
+        .sort((a: any, b: any) => {
+          if (
+            a.__children.length === 0 &&
+            b.__children.length === 0 &&
+            a.name &&
+            b.name
+          ) {
+            return a.name.localeCompare(b.name);
+          }
+
+          return (b.__children?.length || 0) - (a.__children?.length || 0);
+        })
+        .flatMap((child: any) => flattenTree(child, depth + 1, node)),
+    ];
+  }
+
+  // Flatten and assign indices
+  const flatResult = result.flatMap((node) => flattenTree(node));
+
+  for (const item of list) {
+    if (!added.has(item[pk])) {
+      flatResult.push(item);
+    }
+  }
+
+  flatResult.forEach((node, index) => {
     node.idx = index;
   });
 
-  return sortedNodes;
-};
\ No newline at end of file
+  return flatResult;
+};
diff --git a/utils/prasi-events.ts b/utils/prasi-events.ts
index 9382800..3004cc6 100755
--- a/utils/prasi-events.ts
+++ b/utils/prasi-events.ts
@@ -21,6 +21,9 @@ const events = {
   },
   field: {
     on_change: async (fm: FMLocal, field: FieldLocal) => {},
+    relation_load: async (fm: FMLocal, field: FieldLocal) => {
+      return {} as Record<string, any>;
+    },
   },
   tablelist: {
     after_load: async <T extends Prisma.ModelName>(