@@ -474,6 +475,10 @@ func getSubTree(ctx context.Context, srv TreeService_GetSubTreeServer, cid cidSD
 			if err != nil {
 				return err
 			}
+			children, err = sortByFilename(ctx, cid, b.GetTreeId(), children, b.GetOrderBy().GetDirection(), forest)

@@ -485,0 +508,4 @@
+		if filenameBytes, found := filenames[rhs]; found {
+			rightFilename = string(filenameBytes)
+		}
+		return leftFilename < rightFilename

@@ -174,0 +191,4 @@
+				break
+			}
+			if !errors.Is(err, pilorama.ErrTreeNotFound) {
+				e.reportShardError(sh, "can't perform `TreeGetMeta`", err,

@@ -69,2 +69,4 @@
 // do performs a single move operation on a tree.
 func (s *memoryTree) do(op *Move) move {
+	m := op.Meta
+	if m.Items == nil {

@@ -970,2 +971,4 @@
 			children = append(children, binary.LittleEndian.Uint64(k[9:]))
 		}
+
+		for _, childID := range children {

@@ -156,2 +156,2 @@
-	testGetChildren(t, 0, []uint64{10, 2, 7})
-	testGetChildren(t, 10, []uint64{3, 6})
+	testGetChildren(t, 0, []NodeInfo{
+		{NodeID: 10, Meta: Meta{Time: 1, Items: []KeyValue{}}},

@@ -57,1 +57,4 @@
 }
+
+type NodeInfo struct {
+	NodeID   Node

@@ -122,0 +152,4 @@
+	acc := subTreeAcc{errIndex: -1}
+	err := getSubTree(context.Background(), &acc, d.CID, &GetSubTreeRequest_Body{
+		TreeId: treeID,
+		RootId: 0,

@@ -485,0 +493,4 @@
+		return nodes
+	}
+
+	less := func(i, j int) bool {

@@ -971,0 +971,4 @@
+			childInfo := NodeInfo{
+				ID: childID,
+			}
+			parentID, _, metaBytes, found := t.getState(b, stateKey(key, childID))

@@ -971,0 +972,4 @@
+				ID: childID,
+			}
+			parentID, _, metaBytes, found := t.getState(b, stateKey(key, childID))
+			if found {

@@ -483,2 +492,4 @@
 }
 
+func sortByFilename(nodes []pilorama.NodeInfo, d GetSubTreeRequest_Body_Order_Direction) ([]pilorama.NodeInfo, error) {
+	if len(nodes) == 0 {