diff --git a/panoramapublic/src/org/labkey/panoramapublic/bluesky/PanoramaPublicLogoResourceType.java b/panoramapublic/src/org/labkey/panoramapublic/bluesky/PanoramaPublicLogoResourceType.java
index 671f0495..78ff4da8 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/bluesky/PanoramaPublicLogoResourceType.java
+++ b/panoramapublic/src/org/labkey/panoramapublic/bluesky/PanoramaPublicLogoResourceType.java
@@ -34,4 +34,11 @@ public void addWhereSql(SQLFragment sql, String parentColumn, String documentNam
             .appendStringLiteral(PanoramaPublicLogoManager.LOGO_FILE_PREFIX + "%", CoreSchema.getInstance().getSqlDialect())
             .append(") ");
     }
+
+    @Override
+    public @NotNull SQLFragment getSelectEntityIdAndDescriptionSql()
+    {
+        return new SQLFragment("SELECT EntityId, CASE WHEN Name IS NULL THEN '<Root>' ELSE Name END AS Description FROM ")
+            .append(CoreSchema.getInstance().getTableInfoContainers());
+    }
 }
diff --git a/panoramapublic/src/org/labkey/panoramapublic/catalog/CatalogImageAttachmentType.java b/panoramapublic/src/org/labkey/panoramapublic/catalog/CatalogImageAttachmentType.java
index 42aaf4fd..c2a34bef 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/catalog/CatalogImageAttachmentType.java
+++ b/panoramapublic/src/org/labkey/panoramapublic/catalog/CatalogImageAttachmentType.java
@@ -25,8 +25,8 @@ private CatalogImageAttachmentType()
     }
 
     @Override
-    public void addWhereSql(SQLFragment sql, String parentColumn, String documentNameColumn)
+    public @NotNull SQLFragment getSelectEntityIdAndDescriptionSql()
     {
-        sql.append(parentColumn).append(" IN (SELECT EntityId FROM ").append(CoreSchema.getInstance().getTableInfoShortURL(), "shorUrls").append(")");
+        return new SQLFragment("SELECT EntityId, ShortUrl AS Description FROM ").append(CoreSchema.getInstance().getTableInfoShortURL());
     }
 }