Index: openacs-4/packages/acs-templating/tcl/table-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/table-procs.tcl,v
diff -u -r1.11.2.2 -r1.11.2.3
--- openacs-4/packages/acs-templating/tcl/table-procs.tcl	1 Feb 2021 10:54:23 -0000	1.11.2.2
+++ openacs-4/packages/acs-templating/tcl/table-procs.tcl	29 Mar 2023 13:35:30 -0000	1.11.2.3
@@ -192,18 +192,13 @@
         upvar $level "tw_${name}_columns:rowcount" rowcount
 
         # Get the base url for the page
-        set url [ns_conn url]
-        set the_form [ns_getform]
-        set the_joiner "?"
-        if { ![template::util::is_nil $the_form] } {
-            foreach key [ns_set keys $the_form] {
-                if { $key ne "tablewidget:${name}_orderby" } {
-                    append url "${the_joiner}${key}\=[ns_set get $the_form $key]"
-                    set the_joiner "&"
-                }
-            }
-        }
+        set url [export_vars \
+                     -base [ns_conn url] \
+                     -entire_form \
+                     -exclude [list "tablewidget:${name}_orderby"]]
 
+        set the_joiner [expr {[string first ? $url] >= 0 ? "&" : "?"}]
+
         # Convert the column def into a multirow datasource
         set rowcount 0
         foreach {column_name column} $widget(column_def) {