Index: openacs-4/packages/acs-templating/tcl/query-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/query-procs.tcl,v
diff -u -r1.50.2.4 -r1.50.2.5
--- openacs-4/packages/acs-templating/tcl/query-procs.tcl	6 Jun 2020 16:29:08 -0000	1.50.2.4
+++ openacs-4/packages/acs-templating/tcl/query-procs.tcl	28 Dec 2021 16:42:12 -0000	1.50.2.5
@@ -162,14 +162,8 @@
         # Set the results in the calling frame.
         upvar $opts(uplevel) $result_name result
 
-        set size [ns_set size $row]
+        array set result [ns_set array $row]
 
-        for { set i 0 } { $i < $size } { incr i } {
-
-            set column [ns_set key $row $i]
-            set result($column) [ns_set value $row $i]
-        }
-
         if { [info exists opts(cache)] } {
             set opts(result) [array get result]
         }
@@ -236,16 +230,9 @@
 
         set result(rownum) $rowcount
 
-        set size [ns_set size $row]
-
-        for { set i 0 } { $i < $size } { incr i } {
-
-            set column [ns_set key $row $i]
-            set result($column) [ns_set value $row $i]
-
-            if {$rowcount == 1 } {
-                lappend column_list $column
-            }
+        array set result [ns_set array $row]
+        if { $rowcount == 1 } {
+            lappend column_list {*}[ns_set keys $row]
         }
 
         # Execute custom code for each row
@@ -287,14 +274,7 @@
     set rows {}
 
     while { [ns_db getrow $db $row] } {
-
-        set values {}
-        set size [ns_set size $row]
-
-        for { set i 0 } { $i < $size } { incr i } {
-            lappend values [ns_set value $row $i]
-        }
-        lappend rows $values
+        lappend rows [ns_set values $row]
     }
 
     if { [info exists opts(cache)] } {
@@ -333,13 +313,8 @@
 
     while { [ns_db getrow $db $row] } {
 
-        set values {}
-        set size [ns_set size $row]
+        set values [ns_set values $row]
 
-        for { set i 0 } { $i < $size } { incr i } {
-            lappend values [ns_set value $row $i]
-        }
-
         # build the values on which to group
         set group_values [list]
         foreach group $groups {
@@ -1006,9 +981,7 @@
 
         get_query {
             set keyvalues [list]
-            for { set i 0 } { $i < [ns_set size $params] } { incr i } {
-                set key [ns_set key $params $i]
-                set value [ns_set value $params $i]
+            foreach {key value} [ns_set array $params] {
                 lappend keyvalues [ns_urlencode $key]=[ns_urlencode $value]
             }
             set result [join $keyvalues &]
Index: openacs-4/packages/acs-templating/tcl/paginator-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/paginator-procs.tcl,v
diff -u -r1.34.2.3 -r1.34.2.4
--- openacs-4/packages/acs-templating/tcl/paginator-procs.tcl	19 Oct 2021 09:05:12 -0000	1.34.2.3
+++ openacs-4/packages/acs-templating/tcl/paginator-procs.tcl	28 Dec 2021 16:45:05 -0000	1.34.2.4
@@ -230,10 +230,7 @@
             set total_so_far 1
 
             while { \[db_getrow \$db \$selection\] } {
-                set this_result \[list\]
-                for { set i 0 } { \$i < \[ns_set size \$selection\] } { incr i } {
-                    lappend this_result \[ns_set value \$selection \$i\]
-                }
+                set this_result \[ns_set values \$selection\]
                 if { $print_p } {
                     if { \$total_so_far % 250 == 0 } {
                         ns_write \"&#133;\$total_so_far \"
@@ -286,10 +283,7 @@
             set total_so_far 1
 
             while { \[db_getrow \$db \$selection\] } {
-                set this_result \[list\]
-                for { set i 0 } { \$i < \[ns_set size \$selection\] } { incr i } {
-                    lappend this_result \[ns_set value \$selection \$i\]
-                }
+                set this_result \[ns_set values \$selection \]
                 if { $print_p } {
                     if { \$total_so_far % 250 == 0 } {
                         ns_write \"...\$total_so_far \"