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 -N -r1.80 -r1.81
--- openacs-4/packages/acs-tcl/tcl/defs-procs.tcl	31 Jan 2019 07:44:21 -0000	1.80
+++ openacs-4/packages/acs-tcl/tcl/defs-procs.tcl	11 Feb 2019 09:56:49 -0000	1.81
@@ -480,7 +480,13 @@
             and    apm_parameters.package_key = :key
         } -default ""]
     } else {
-        set value [db_string select_instance_parameter_value {} -default ""]
+        set value [db_string select_instance_parameter_value {
+            select apm_parameter_values.attr_value
+            from   apm_parameters, apm_parameter_values
+            where  apm_parameter_values.package_id = :key
+            and    apm_parameter_values.parameter_id = apm_parameters.parameter_id
+            and    apm_parameters.parameter_name = :parameter_name
+        } -default ""]
     }
     nsv_set "ad_param_${key}" $parameter_name $value
     return $value
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 -N
--- openacs-4/packages/acs-tcl/tcl/defs-procs.xql	27 Jan 2018 16:55:43 -0000	1.6
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<queryset>
-
-  <fullquery name="ad_parameter_cache.select_instance_parameter_value">      
-    <querytext>
-      select apm_parameter_values.attr_value
-      from apm_parameters, apm_parameter_values
-      where apm_parameter_values.package_id = :key
-      and apm_parameter_values.parameter_id = apm_parameters.parameter_id
-      and apm_parameters.parameter_name = :parameter_name
-    </querytext>
-  </fullquery>
-
-  <fullquery name="ad_parameter_cache_all.parameters_get_all">      
-    <querytext>
-      select v.package_id, p.parameter_name, v.attr_value
-      from apm_parameters p, apm_parameter_values v
-      where p.parameter_id = v.parameter_id
-    </querytext>
-  </fullquery>
-
-
-</queryset>