Index: openacs-4/packages/chat/www/search-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/search-2.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/chat/www/search-2.tcl	17 Jun 2016 17:27:51 -0000	1.5
+++ openacs-4/packages/chat/www/search-2.tcl	17 Jun 2016 17:36:11 -0000	1.6
@@ -120,13 +120,13 @@
     set user_search:[set rowcount](first_names) $first_names
     set user_search:[set rowcount](last_name) $last_name
     set user_search:[set rowcount](email) $email
-    set user_search:[set rowcount](export_vars) [export_url_vars user_id_from_search first_names_from_search last_name_from_search email_from_search]
+    set user_search:[set rowcount](export_vars) [export_vars {user_id_from_search first_names_from_search last_name_from_search email_from_search}]
     set user_search:[set rowcount](member_state) $member_state
     set user_search:[set rowcount](url) [export_vars -base "search-3" {room_id type {party_id $user_id}}]
 
     
     if { $member_state ne "approved" } {
-        set user_search:[set rowcount](user_finite_state_links) [join [ad_registration_finite_state_machine_admin_links $member_state $email_verified_p $user_id_from_search "search?[export_url_vars email last_name keyword target passthrough limit_users_in_group_id only_authorized_p]"] " | "]
+        set user_search:[set rowcount](user_finite_state_links) [join [ad_registration_finite_state_machine_admin_links $member_state $email_verified_p $user_id_from_search [export_vars -base search {email last_name keyword target passthrough limit_users_in_group_id only_authorized_p}]] " | "]
     } else {
         set user_search:[set rowcount](user_finite_state_links) ""
     }