Index: openacs-4/packages/contacts/tcl/contacts-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-procs-postgresql.xql,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/contacts/tcl/contacts-procs-postgresql.xql	15 Mar 2006 23:04:53 -0000	1.15
+++ openacs-4/packages/contacts/tcl/contacts-procs-postgresql.xql	17 Apr 2006 06:23:00 -0000	1.16
@@ -69,7 +69,7 @@
            CASE WHEN contact_groups.package_id is not null THEN '1' ELSE '0' END as mapped_p,
            CASE WHEN default_p THEN '1' ELSE '0' END as default_p
       from groups left join ( select * from contact_groups where package_id = :package_id ) as contact_groups on ( groups.group_id = contact_groups.group_id ), acs_objects
-     where groups.group_id not in ('-1','[contacts::default_group]')
+     where groups.group_id not in ('-1','[contacts::default_group -package_id $package_id]')
 	and groups.group_id = acs_objects.object_id
        and groups.group_id not in ( select gcm.component_id from group_component_map gcm where gcm.group_id != -1 )
        and groups.group_id not in ( select group_id from application_groups )
Index: openacs-4/packages/contacts/tcl/contacts-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-procs.tcl,v
diff -u -r1.79 -r1.80
--- openacs-4/packages/contacts/tcl/contacts-procs.tcl	17 Apr 2006 06:15:01 -0000	1.79
+++ openacs-4/packages/contacts/tcl/contacts-procs.tcl	17 Apr 2006 06:23:00 -0000	1.80
@@ -946,7 +946,7 @@
     {-package_id ""}
 } {
 } {
-    if { $package_id ne "" } {
+    if { $package_id eq "" } {
 	set package_id [ad_conn package_id]
     }
     set user_id [ad_conn user_id]