Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -N -r1.239.2.86 -r1.239.2.87
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	23 Mar 2022 20:37:16 -0000	1.239.2.86
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	24 Mar 2022 08:06:49 -0000	1.239.2.87
@@ -2857,7 +2857,6 @@
       $p set page_order $:page_order([$p set name])
     }
 
-    $pages mixin add ::xo::OrderedComposite::IndexCompare
     if {$range ne ""} {
       lassign [split $range -] from to
       foreach p [$pages children] {
@@ -2868,7 +2867,7 @@
       }
     }
 
-    $pages orderby page_order
+    $pages orderby -type index page_order
     return [:render_children $pages $menu_buttons]
   }
 
@@ -3175,9 +3174,9 @@
         [::xowiki::Page container_already_rendered item_id]"
 
     set pages [::xowiki::Page instantiate_objects -sql $sql]
-    $pages mixin add ::xo::OrderedComposite::IndexCompare
     $pages orderby \
         -order [expr {$order_direction in {asc ""} ? "increasing" : "decreasing"}] \
+        -type [ad_decode $order_attribute page_order index dictionary] \
         $order_attribute
 
     #
Index: openacs-4/packages/xowiki/tcl/tree-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/tree-procs.tcl,v
diff -u -N -r1.23.2.17 -r1.23.2.18
--- openacs-4/packages/xowiki/tcl/tree-procs.tcl	7 Mar 2022 16:00:36 -0000	1.23.2.17
+++ openacs-4/packages/xowiki/tcl/tree-procs.tcl	24 Mar 2022 08:06:49 -0000	1.23.2.18
@@ -58,11 +58,11 @@
     if {![nsf::is object $items]} {
       ::xo::OrderedComposite create $items
       if {[info exists orderby]} {
-        if {$orderby eq "page_order"} {
-          $items mixin add ::xo::OrderedComposite::IndexCompare
-        }
         set direction [expr {$increasing ? "increasing" : "decreasing"}]
-        $items orderby -order $direction $orderby
+        $items orderby \
+            -order $direction \
+            -type [ad_decode $orderby page_order index dictionary] \
+            $orderby
       }
     }
     $items add $itemobj
@@ -113,7 +113,7 @@
     set pos 0
     if {${:verbose}} {
       :log "add_pages want to add [llength [$pages children]] pages"
-    }   
+    }
     set ul_class [expr {[dict exists $properties CSSclass_ul] ?
                         [dict get $properties CSSclass_ul] : ""}]
     foreach o [$pages children] {