diff --git a/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicSchema.java b/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicSchema.java
index d49ce909..f5f138aa 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicSchema.java
+++ b/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicSchema.java
@@ -340,7 +340,7 @@ protected void applyContainerFilter(ContainerFilter filter)
                 sql.append(super.getFromSQL("X"));
                 sql.append(" ");
 
-                if (getContainerFilter() != ContainerFilter.EVERYTHING)
+                if (getContainerFilter() != ContainerFilter.EVERYTHING_UNSAFE)
                 {
                     SQLFragment joinToExpAnnotSql = new SQLFragment("INNER JOIN ");
                     joinToExpAnnotSql.append(PanoramaPublicManager.getTableInfoSubmission(), "s");
diff --git a/panoramapublic/src/org/labkey/panoramapublic/query/ExperimentAnnotationsTableInfo.java b/panoramapublic/src/org/labkey/panoramapublic/query/ExperimentAnnotationsTableInfo.java
index 4c93fbea..910ef7bf 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/query/ExperimentAnnotationsTableInfo.java
+++ b/panoramapublic/src/org/labkey/panoramapublic/query/ExperimentAnnotationsTableInfo.java
@@ -427,7 +427,7 @@ private ExprColumn getAnnouncementIdCol()
 
         // Add a FK lookup so that we can access the "Modified" etc. columns on the "Announcement" table.
         announcementCol.setFk(QueryForeignKey.from(getUserSchema(),
-                        ContainerFilter.EVERYTHING) // Announcements are not in the same container. e.g. on PanoramaWeb they are in "/home/support/panorama public requests"
+                        ContainerFilter.EVERYTHING_UNSAFE) // Announcements are not in the same container. e.g. on PanoramaWeb they are in "/home/support/panorama public requests"
                 .schema("announcement")  // Cannot use CommSchemma.getSchemaName() which returns "comm". This only works if we use "announcement".
                                                     // AnnouncementSchema is not part of the LabKey API.
                 .to("Announcement", // Table name cannot be the plural, "Announcements", returned by CommSchema.getInstance().getTableInfoAnnouncements().getName()
diff --git a/panoramapublic/src/org/labkey/panoramapublic/query/JournalExperimentTableInfo.java b/panoramapublic/src/org/labkey/panoramapublic/query/JournalExperimentTableInfo.java
index 292f9898..185a1e6e 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/query/JournalExperimentTableInfo.java
+++ b/panoramapublic/src/org/labkey/panoramapublic/query/JournalExperimentTableInfo.java
@@ -76,7 +76,7 @@ public SQLFragment getFromSQL(String alias)
         sql.append(super.getFromSQL("X"));
         sql.append(" ");
 
-        if (getContainerFilter() != ContainerFilter.EVERYTHING)
+        if (getContainerFilter() != ContainerFilter.EVERYTHING_UNSAFE)
         {
             // Filter on the Container column of the associated ExperimentAnnotations row
             SQLFragment joinToExpAnnotSql = new SQLFragment("INNER JOIN ");
diff --git a/panoramapublic/src/org/labkey/panoramapublic/query/PanoramaPublicTable.java b/panoramapublic/src/org/labkey/panoramapublic/query/PanoramaPublicTable.java
index 4cf68fb7..21ca6b79 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/query/PanoramaPublicTable.java
+++ b/panoramapublic/src/org/labkey/panoramapublic/query/PanoramaPublicTable.java
@@ -57,7 +57,7 @@ public SQLFragment getFromSQL(String alias)
         sql.append(super.getFromSQL(TABLE_ALIAS));
         sql.append(" ");
 
-        if (getContainerFilter() != ContainerFilter.EVERYTHING)
+        if (getContainerFilter() != ContainerFilter.EVERYTHING_UNSAFE)
         {
             sql.append(_joinSql.getSQL());
             sql.append(" WHERE ");
diff --git a/panoramapublic/src/org/labkey/panoramapublic/query/SubmissionTableInfo.java b/panoramapublic/src/org/labkey/panoramapublic/query/SubmissionTableInfo.java
index e4b4ed7c..45b7fcac 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/query/SubmissionTableInfo.java
+++ b/panoramapublic/src/org/labkey/panoramapublic/query/SubmissionTableInfo.java
@@ -113,7 +113,7 @@ public SQLFragment getFromSQL(String alias)
         sql.append(super.getFromSQL("X"));
         sql.append(" ");
 
-        if (getContainerFilter() != ContainerFilter.EVERYTHING)
+        if (getContainerFilter() != ContainerFilter.EVERYTHING_UNSAFE)
         {
             SQLFragment joinSql = new SQLFragment("INNER JOIN ");
             joinSql.append(PanoramaPublicManager.getTableInfoJournalExperiment(), "je")