diff --git a/packages/core-components/api-report.md b/packages/core-components/api-report.md
index bfc6852a97..e8d3214beb 100644
--- a/packages/core-components/api-report.md
+++ b/packages/core-components/api-report.md
@@ -1202,7 +1202,7 @@ export const Page: ({
   children,
 }: PropsWithChildren<Props_21>) => JSX.Element;
 
-// Warning: (ae-forgotten-export) The symbol "IProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-forgotten-export) The symbol "ThemedHeaderProps" needs to be exported by the entry point index.d.ts
 // Warning: (ae-missing-release-tag) "PageWithHeader" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -1210,7 +1210,7 @@ export const PageWithHeader: ({
   themeId,
   children,
   ...props
-}: React_2.PropsWithChildren<IProps>) => JSX.Element;
+}: React_2.PropsWithChildren<ThemedHeaderProps>) => JSX.Element;
 
 // Warning: (ae-missing-release-tag) "Progress" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
diff --git a/packages/core-components/src/layout/Page/PageWithHeader.tsx b/packages/core-components/src/layout/Page/PageWithHeader.tsx
index 4155805476..6095b4df16 100644
--- a/packages/core-components/src/layout/Page/PageWithHeader.tsx
+++ b/packages/core-components/src/layout/Page/PageWithHeader.tsx
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-import React, { ComponentProps } from 'react';
+import React, { PropsWithChildren, ComponentProps } from 'react';
 
 import { Header } from '../Header';
 import { Page } from './Page';
 
-type ThemedHeaderProps = ComponentProps<typeof Header> & {
+export type ThemedHeaderProps = ComponentProps<typeof Header> & {
   themeId: string;
 };
 
@@ -27,7 +27,7 @@ export const PageWithHeader = ({
   themeId,
   children,
   ...props
-}: React.PropsWithChildren<ThemedHeaderProps>) => (
+}: PropsWithChildren<ThemedHeaderProps>) => (
   <Page themeId={themeId}>
     <Header {...props} />
     {children}
diff --git a/plugins/api-docs/api-report.md b/plugins/api-docs/api-report.md
index a368cf5675..639485a42d 100644
--- a/plugins/api-docs/api-report.md
+++ b/plugins/api-docs/api-report.md
@@ -52,14 +52,16 @@ const apiDocsPlugin: BackstagePlugin<
 export { apiDocsPlugin };
 export { apiDocsPlugin as plugin };
 
-// Warning: (ae-forgotten-export) The symbol "ApiExplorerPageProps" needs to be exported by the entry point index.d.ts
 // Warning: (ae-missing-release-tag) "ApiExplorerPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const ApiExplorerPage: ({
   initiallySelectedFilter,
   columns,
-}: ApiExplorerPageProps) => JSX.Element;
+}: {
+  initiallySelectedFilter?: UserListFilterKind | undefined;
+  columns?: TableColumn<CatalogTableRow>[] | undefined;
+}) => JSX.Element;
 
 // Warning: (ae-missing-release-tag) "ApiTypeTitle" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
diff --git a/plugins/catalog/api-report.md b/plugins/catalog/api-report.md
index b3169d5c29..4ed69230ec 100644
--- a/plugins/catalog/api-report.md
+++ b/plugins/catalog/api-report.md
@@ -48,15 +48,6 @@ export const AboutField: ({
 // @public (undocumented)
 export const CatalogEntityPage: () => JSX.Element;
 
-// Warning: (ae-forgotten-export) The symbol "IProps" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "CatalogFilter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-export const CatalogFilter: ({
-  initiallySelectedFilter,
-  initialFilter,
-}: IProps) => JSX.Element;
-
 // Warning: (ae-forgotten-export) The symbol "CatalogPageProps" needs to be exported by the entry point index.d.ts
 // Warning: (ae-missing-release-tag) "CatalogIndexPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
@@ -247,6 +238,13 @@ export const EntityLinksCard: ({
   variant?: 'gridItem' | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EntityListContainer" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const EntityListContainer: ({
+  children,
+}: PropsWithChildren<{}>) => JSX.Element;
+
 // Warning: (ae-missing-release-tag) "EntityOrphanWarning" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public
@@ -292,13 +290,12 @@ export const FilterContainer: ({
   children,
 }: React_2.PropsWithChildren<{}>) => JSX.Element;
 
-// Warning: (ae-forgotten-export) The symbol "IProps" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "FilteredTableLayout" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "FilteredEntityLayout" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export const FilteredTableLayout: ({
+export const FilteredEntityLayout: ({
   children,
-}: React_2.PropsWithChildren<IProps_2>) => JSX.Element;
+}: PropsWithChildren<{}>) => JSX.Element;
 
 // Warning: (ae-missing-release-tag) "isComponentType" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
@@ -329,13 +326,6 @@ export const Router: ({
   EntityPage?: React_2.ComponentType<{}> | undefined;
 }) => JSX.Element;
 
-// Warning: (ae-missing-release-tag) "TableContainer" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-export const TableContainer: ({
-  children,
-}: React_2.PropsWithChildren<{}>) => JSX.Element;
-
 // Warnings were encountered during analysis:
 //
 // src/components/CatalogTable/CatalogTable.d.ts:10:5 - (ae-forgotten-export) The symbol "CatalogTableProps" needs to be exported by the entry point index.d.ts
diff --git a/plugins/catalog/src/components/FilteredEntityLayout/FilterContainer.tsx b/plugins/catalog/src/components/FilteredEntityLayout/FilterContainer.tsx
index 6502811332..693d2f23b3 100644
--- a/plugins/catalog/src/components/FilteredEntityLayout/FilterContainer.tsx
+++ b/plugins/catalog/src/components/FilteredEntityLayout/FilterContainer.tsx
@@ -20,6 +20,7 @@ import {
   Button,
   Drawer,
   Grid,
+  Typography,
   useMediaQuery,
   useTheme,
 } from '@material-ui/core';
@@ -57,7 +58,16 @@ export const FilterContainer = ({ children }: React.PropsWithChildren<{}>) => {
         keepMounted
         variant="temporary"
       >
-        <Box m={2}>{children}</Box>
+        <Box m={2}>
+          <Typography
+            variant="h6"
+            component="h2"
+            style={{ marginBottom: theme.spacing(1) }}
+          >
+            Filters
+          </Typography>
+          {children}
+        </Box>
       </Drawer>
     </>
   ) : (