Index: openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl	11 Jul 2018 21:57:26 -0000	1.23
+++ openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl	14 Sep 2018 18:15:49 -0000	1.24
@@ -209,7 +209,8 @@
 		} else {
 		    if {$choose_file ne ""} {
 			set item_id $choose_file
-			set file_name [lindex $recent_files_options [util_search_list_of_lists $recent_files_options $item_id 1] 0]
+                        set file_name [lindex $recent_files_options [lsearch -index 1 $recent_files_options $item_id] 0]
+
 			# we have to get rid of the icon from the form.
 			set file_name [regsub -all {<.*?>} $file_name {}]
 		    }
Index: openacs-4/packages/acs-templating/www/scripts/xinha/attach-image.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/scripts/xinha/attach-image.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/acs-templating/www/scripts/xinha/attach-image.tcl	11 Jul 2018 21:57:26 -0000	1.16
+++ openacs-4/packages/acs-templating/www/scripts/xinha/attach-image.tcl	14 Sep 2018 18:15:49 -0000	1.17
@@ -173,7 +173,7 @@
 	    } else {
 		# user chose an existing file
 		set item_id $choose_file 
-		set file_name [lindex $recent_images_options [util_search_list_of_lists $recent_images_options $item_id 1] 0]
+		set file_name [lindex $recent_images_options [lsearch -index 1 $recent_images_options $item_id] 0]
 	    }
 		set f_url "/image/${item_id}/${file_name}"			    
 	}
Index: openacs-4/packages/simple-survey/tcl/survsimp-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/tcl/survsimp-procs.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/simple-survey/tcl/survsimp-procs.tcl	9 May 2018 15:33:33 -0000	1.10
+++ openacs-4/packages/simple-survey/tcl/survsimp-procs.tcl	14 Sep 2018 18:18:49 -0000	1.11
@@ -379,7 +379,7 @@
 
 ns_share ad_new_stuff_module_list
 
-if { ![info exists ad_new_stuff_module_list] || [util_search_list_of_lists $ad_new_stuff_module_list "Surveys" 0] == -1 } {
+if { ![info exists ad_new_stuff_module_list] || [lsearch -index 0 $ad_new_stuff_module_list "Surveys" 0] == -1 } {
     lappend ad_new_stuff_module_list [list "Surveys" ad_survsimp_new_stuff]
 }