Index: openacs-4/packages/acs-tcl/tcl/defs-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/defs-procs.tcl,v
diff -u -r1.69 -r1.70
--- openacs-4/packages/acs-tcl/tcl/defs-procs.tcl	17 Jan 2018 22:11:38 -0000	1.69
+++ openacs-4/packages/acs-tcl/tcl/defs-procs.tcl	21 Jan 2018 18:48:33 -0000	1.70
@@ -468,7 +468,14 @@
     } elseif { [nsv_exists ad_param_$key $parameter_name] } {
 	return [nsv_get ad_param_$key $parameter_name]
     } elseif { $global_p } {
-        set value [db_string select_global_parameter_value {} -default ""]
+        set value [db_string select_global_parameter_value {
+            select apm_parameter_values.attr_value
+            from   apm_parameters, apm_parameter_values
+            where  apm_parameter_values.package_id is null
+            and    apm_parameter_values.parameter_id = apm_parameters.parameter_id
+            and    apm_parameters.parameter_name = :parameter_name
+            and    apm_parameters.package_key = :key
+        } -default ""]
     } else {
         set value [db_string select_instance_parameter_value {} -default ""]
     }
Index: openacs-4/packages/acs-tcl/tcl/defs-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/defs-procs.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-tcl/tcl/defs-procs.xql	20 Nov 2017 15:25:18 -0000	1.4
+++ openacs-4/packages/acs-tcl/tcl/defs-procs.xql	21 Jan 2018 18:48:33 -0000	1.5
@@ -10,16 +10,6 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="ad_parameter_cache.select_global_parameter_value">      
-    <querytext>
-      select apm_parameter_values.attr_value
-      from apm_parameters, apm_parameter_values
-      where apm_parameter_values.package_id is null
-      and apm_parameter_values.parameter_id = apm_parameters.parameter_id
-      and apm_parameters.parameter_name = :parameter_name
-    </querytext>
-  </fullquery>
-
   <fullquery name="ad_parameter_cache.select_instance_parameter_value">      
     <querytext>
       select apm_parameter_values.attr_value