Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v
diff -u -N -r1.114.2.27 -r1.114.2.28
--- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	22 Feb 2021 15:08:49 -0000	1.114.2.27
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	22 Feb 2021 17:01:44 -0000	1.114.2.28
@@ -1320,7 +1320,7 @@
     return $result
 }
 
-ad_proc -public apm_package_id_from_key_not_cached {package_key} {
+ad_proc -private apm_package_id_from_key_not_cached {package_key} {
     unmemoized version of apm_package_id_from_key
 } {
     return [db_string apm_package_id_from_key {
Index: openacs-4/packages/search/tcl/search-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/tcl/search-init.tcl,v
diff -u -N -r1.13.2.1 -r1.13.2.2
--- openacs-4/packages/search/tcl/search-init.tcl	4 Aug 2020 10:25:21 -0000	1.13.2.1
+++ openacs-4/packages/search/tcl/search-init.tcl	22 Feb 2021 17:01:44 -0000	1.13.2.2
@@ -8,11 +8,13 @@
     Schedule the indexer if the search package has been instantiated (indexing doesn't work
     if it hasn't been, so why should we schedule it?).
 
-    We use the uncached version of apm_package_id_from_key to avoid forcing the user to
-    restart their server after mounting search.
-
+    We do not use the cached api apm_package_id_from_key to avoid
+    forcing the user to restart their server after mounting search.
 } {
-    set package_id [apm_package_id_from_key_not_cached search]
+    set package_id [db_string get_package {
+        select package_id from apm_packages
+        where package_key = 'search'
+    } -default 0]
     if { $package_id != 0 } {
         ad_schedule_proc \
             -thread t [parameter::get \
Index: openacs-4/packages/search/www/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.tcl,v
diff -u -N -r1.41.2.1 -r1.41.2.2
--- openacs-4/packages/search/www/search.tcl	8 Oct 2020 11:15:29 -0000	1.41.2.1
+++ openacs-4/packages/search/www/search.tcl	22 Feb 2021 17:01:44 -0000	1.41.2.2
@@ -59,6 +59,7 @@
     array set info [acs_sc::invoke -contract FtsEngineDriver -operation info -call_args [list] -impl $driver]
 }
 
+
 if { [array get info] eq "" } {
     ns_return 200 text/html [_ search.lt_FtsEngineDriver_not_a]
     ad_script_abort