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 -r1.239.2.98 -r1.239.2.99
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	12 Oct 2022 13:04:30 -0000	1.239.2.98
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	12 Oct 2022 17:13:26 -0000	1.239.2.99
@@ -4670,22 +4670,22 @@
                    -from_package_ids $package_ids \
                    -package_id $package_id]
 
-    # if {[info exists with_categories]} {
-    #   if {$extra_where_clause eq ""} {
-    #     set base_items $items
-    #   } else {
-    #     # difference to variable items: just the extra_where_clause
-    #     set base_items [::xowiki::FormPage get_form_entries \
-    #                         -base_item_ids $form_item_ids \
-    #                         -parent_id $query_parent_id \
-    #                         -form_fields $form_field_objs \
-    #                         -publish_status $publish_status \
-    #                         -h_where [dict get $filters wc] \
-    #                         -h_unless [dict get $filters uc] \
-    #                         -from_package_ids $package_ids \
-    #                         -package_id $package_id]
-    #   }
-    # }
+    if {[info exists with_categories]} {
+      if {$extra_where_clause eq ""} {
+        set base_items $items
+      } else {
+        # difference to variable items: just the extra_where_clause
+        set base_items [::xowiki::FormPage get_form_entries \
+                            -base_item_ids $form_item_ids \
+                            -parent_id $query_parent_id \
+                            -form_fields $form_field_objs \
+                            -publish_status $publish_status \
+                            -h_where [dict get $filters wc] \
+                            -h_unless [dict get $filters uc] \
+                            -from_package_ids $package_ids \
+                            -package_id $package_id]
+      }
+    }
 
     #:log "queries done"
     if {[info exists wf]} {
@@ -4696,7 +4696,7 @@
                   -form_field_objs $form_field_objs \
                   -return_url [ad_return_url] \
                   -package_id $package_id \
-                  -items $items \
+                  -items $base_items \
                   -init_vars [dict get $filters init_vars] \
                   -view_field $view_field \
                   -buttons $buttons \