diff --git a/app/browse/datatable.tsx b/app/browse/datatable.tsx
index 42ca10fb5..9b15a5ace 100644
--- a/app/browse/datatable.tsx
+++ b/app/browse/datatable.tsx
@@ -30,9 +30,9 @@ import {
 } from "@/domain/data";
 import { useDimensionFormatters } from "@/formatters";
 import {
-  useDataCubeMetadataQuery,
   useDataCubeObservationsQuery,
   useDataCubesComponentsQuery,
+  useDataCubesMetadataQuery,
 } from "@/graphql/query-hooks";
 import SvgIcChevronDown from "@/icons/components/IcChevronDown";
 import { useLocale } from "@/locales/use-locale";
@@ -257,10 +257,10 @@ export const DataSetTable = ({
     sourceUrl: dataSource.url,
     locale,
   };
-  const [{ data: metadataData }] = useDataCubeMetadataQuery({
+  const [{ data: metadataData }] = useDataCubesMetadataQuery({
     variables: {
       ...commonQueryVariables,
-      iri: dataSetIri,
+      filters: [{ iri: dataSetIri }],
     },
   });
   const [{ data: componentsData }] = useDataCubesComponentsQuery({
@@ -289,12 +289,13 @@ export const DataSetTable = ({
     ]);
   }, [componentsData?.dataCubesComponents]);
 
-  return metadataData?.dataCubeByIri &&
+  return metadataData?.dataCubesMetadata &&
     componentsData?.dataCubesComponents &&
     observationsData?.dataCubeByIri ? (
     <Box sx={{ maxHeight: "600px", overflow: "auto", ...sx }}>
       <PreviewTable
-        title={metadataData.dataCubeByIri.title}
+        // FIXME: adapt to design
+        title={metadataData.dataCubesMetadata.map((d) => d.title).join(", ")}
         headers={headers}
         observations={observationsData.dataCubeByIri.observations.data}
         linkToMetadataPanel={true}
diff --git a/app/charts/area/chart-area.tsx b/app/charts/area/chart-area.tsx
index 5e31a4235..9c634c79e 100644
--- a/app/charts/area/chart-area.tsx
+++ b/app/charts/area/chart-area.tsx
@@ -17,9 +17,9 @@ import { LegendColor } from "@/charts/shared/legend-color";
 import { InteractionHorizontal } from "@/charts/shared/overlay-horizontal";
 import { AreaConfig, DataSource, QueryFilters } from "@/config-types";
 import {
-  useDataCubeMetadataQuery,
   useDataCubeObservationsQuery,
   useDataCubesComponentsQuery,
+  useDataCubesMetadataQuery,
 } from "@/graphql/query-hooks";
 import { useLocale } from "@/locales/use-locale";
 
@@ -44,10 +44,10 @@ export const ChartAreasVisualization = ({
     sourceUrl: dataSource.url,
     locale,
   };
-  const [metadataQuery] = useDataCubeMetadataQuery({
+  const [metadataQuery] = useDataCubesMetadataQuery({
     variables: {
       ...commonQueryVariables,
-      iri: dataSetIri,
+      filters: [{ iri: dataSetIri }],
     },
   });
   const [componentsQuery] = useDataCubesComponentsQuery({
diff --git a/app/charts/chart-loading-wrapper.tsx b/app/charts/chart-loading-wrapper.tsx
index 34b2ed2ac..40186e70d 100644
--- a/app/charts/chart-loading-wrapper.tsx
+++ b/app/charts/chart-loading-wrapper.tsx
@@ -15,9 +15,9 @@ import {
 } from "@/components/hint";
 import { ChartConfig } from "@/configurator";
 import {
-  DataCubeMetadataQuery,
   DataCubeObservationsQuery,
   DataCubesComponentsQuery,
+  DataCubesMetadataQuery,
 } from "@/graphql/query-hooks";
 
 type ElementProps<RE> = RE extends React.ElementType<infer P> ? P : never;
@@ -35,7 +35,7 @@ export const ChartLoadingWrapper = <
   ComponentProps,
 }: {
   metadataQuery: Pick<
-    UseQueryResponse<DataCubeMetadataQuery>[0],
+    UseQueryResponse<DataCubesMetadataQuery>[0],
     "data" | "fetching" | "error"
   >;
   componentsQuery: Pick<
@@ -70,7 +70,7 @@ export const ChartLoadingWrapper = <
     error: observationsError,
   } = observationsQuery;
 
-  const metadata = metadataData?.dataCubeByIri;
+  const metadata = metadataData?.dataCubesMetadata;
   const observations = observationsData?.dataCubeByIri?.observations.data;
   const dimensions = componentsData?.dataCubesComponents.dimensions;
   const measures = componentsData?.dataCubesComponents.measures;
@@ -90,7 +90,8 @@ export const ChartLoadingWrapper = <
   }, [dimensions, measures]);
 
   if (metadata && dimensions && measures && observations) {
-    const { title } = metadata;
+    // FIXME: adapt to design
+    const title = metadata.map((d) => d.title).join(", ");
 
     return (
       <Box
diff --git a/app/charts/column/chart-column.tsx b/app/charts/column/chart-column.tsx
index c0757294d..a57f9a741 100644
--- a/app/charts/column/chart-column.tsx
+++ b/app/charts/column/chart-column.tsx
@@ -27,9 +27,9 @@ import { LegendColor } from "@/charts/shared/legend-color";
 import { ColumnConfig, DataSource, QueryFilters } from "@/config-types";
 import { TimeSlider } from "@/configurator/interactive-filters/time-slider";
 import {
-  useDataCubeMetadataQuery,
   useDataCubeObservationsQuery,
   useDataCubesComponentsQuery,
+  useDataCubesMetadataQuery,
 } from "@/graphql/query-hooks";
 import { useLocale } from "@/locales/use-locale";
 
@@ -54,10 +54,10 @@ export const ChartColumnsVisualization = ({
     sourceUrl: dataSource.url,
     locale,
   };
-  const [metadataQuery] = useDataCubeMetadataQuery({
+  const [metadataQuery] = useDataCubesMetadataQuery({
     variables: {
       ...commonQueryVariables,
-      iri: dataSetIri,
+      filters: [{ iri: dataSetIri }],
     },
   });
   const [componentsQuery] = useDataCubesComponentsQuery({
diff --git a/app/charts/combo/chart-combo-line-column.tsx b/app/charts/combo/chart-combo-line-column.tsx
index e9b5fdf30..6ab0000b6 100644
--- a/app/charts/combo/chart-combo-line-column.tsx
+++ b/app/charts/combo/chart-combo-line-column.tsx
@@ -17,9 +17,9 @@ import {
   QueryFilters,
 } from "@/config-types";
 import {
-  useDataCubeMetadataQuery,
   useDataCubeObservationsQuery,
   useDataCubesComponentsQuery,
+  useDataCubesMetadataQuery,
 } from "@/graphql/query-hooks";
 import { useLocale } from "@/locales/use-locale";
 
@@ -44,10 +44,10 @@ export const ChartComboLineColumnVisualization = (
     sourceUrl: dataSource.url,
     locale,
   };
-  const [metadataQuery] = useDataCubeMetadataQuery({
+  const [metadataQuery] = useDataCubesMetadataQuery({
     variables: {
       ...commonQueryVariables,
-      iri: dataSetIri,
+      filters: [{ iri: dataSetIri }],
     },
   });
   const [componentsQuery] = useDataCubesComponentsQuery({
diff --git a/app/charts/combo/chart-combo-line-dual.tsx b/app/charts/combo/chart-combo-line-dual.tsx
index f56e9c34b..3c47cfaa8 100644
--- a/app/charts/combo/chart-combo-line-dual.tsx
+++ b/app/charts/combo/chart-combo-line-dual.tsx
@@ -13,9 +13,9 @@ import { Tooltip } from "@/charts/shared/interaction/tooltip";
 import { InteractionHorizontal } from "@/charts/shared/overlay-horizontal";
 import { ComboLineDualConfig, DataSource, QueryFilters } from "@/config-types";
 import {
-  useDataCubeMetadataQuery,
   useDataCubeObservationsQuery,
   useDataCubesComponentsQuery,
+  useDataCubesMetadataQuery,
 } from "@/graphql/query-hooks";
 import { useLocale } from "@/locales/use-locale";
 
@@ -40,10 +40,10 @@ export const ChartComboLineDualVisualization = (
     sourceUrl: dataSource.url,
     locale,
   };
-  const [metadataQuery] = useDataCubeMetadataQuery({
+  const [metadataQuery] = useDataCubesMetadataQuery({
     variables: {
       ...commonQueryVariables,
-      iri: dataSetIri,
+      filters: [{ iri: dataSetIri }],
     },
   });
   const [componentsQuery] = useDataCubesComponentsQuery({
diff --git a/app/charts/combo/chart-combo-line-single.tsx b/app/charts/combo/chart-combo-line-single.tsx
index 09e6eec74..121f08692 100644
--- a/app/charts/combo/chart-combo-line-single.tsx
+++ b/app/charts/combo/chart-combo-line-single.tsx
@@ -22,9 +22,9 @@ import {
   QueryFilters,
 } from "@/config-types";
 import {
-  useDataCubeMetadataQuery,
   useDataCubeObservationsQuery,
   useDataCubesComponentsQuery,
+  useDataCubesMetadataQuery,
 } from "@/graphql/query-hooks";
 import { useLocale } from "@/locales/use-locale";
 
@@ -49,10 +49,10 @@ export const ChartComboLineSingleVisualization = (
     sourceUrl: dataSource.url,
     locale,
   };
-  const [metadataQuery] = useDataCubeMetadataQuery({
+  const [metadataQuery] = useDataCubesMetadataQuery({
     variables: {
       ...commonQueryVariables,
-      iri: dataSetIri,
+      filters: [{ iri: dataSetIri }],
     },
   });
   const [componentsQuery] = useDataCubesComponentsQuery({
diff --git a/app/charts/line/chart-lines.tsx b/app/charts/line/chart-lines.tsx
index 7f855dc24..d0d6d0a2e 100644
--- a/app/charts/line/chart-lines.tsx
+++ b/app/charts/line/chart-lines.tsx
@@ -18,9 +18,9 @@ import { LegendColor } from "@/charts/shared/legend-color";
 import { InteractionHorizontal } from "@/charts/shared/overlay-horizontal";
 import { DataSource, LineConfig, QueryFilters } from "@/config-types";
 import {
-  useDataCubeMetadataQuery,
   useDataCubeObservationsQuery,
   useDataCubesComponentsQuery,
+  useDataCubesMetadataQuery,
 } from "@/graphql/query-hooks";
 import { useLocale } from "@/locales/use-locale";
 
@@ -45,10 +45,10 @@ export const ChartLinesVisualization = ({
     sourceUrl: dataSource.url,
     locale,
   };
-  const [metadataQuery] = useDataCubeMetadataQuery({
+  const [metadataQuery] = useDataCubesMetadataQuery({
     variables: {
       ...commonQueryVariables,
-      iri: dataSetIri,
+      filters: [{ iri: dataSetIri }],
     },
   });
   const [componentsQuery] = useDataCubesComponentsQuery({
diff --git a/app/charts/map/chart-map.tsx b/app/charts/map/chart-map.tsx
index 14f26aac2..54552928c 100644
--- a/app/charts/map/chart-map.tsx
+++ b/app/charts/map/chart-map.tsx
@@ -15,9 +15,9 @@ import { TimeSlider } from "@/configurator/interactive-filters/time-slider";
 import { GeoShapes } from "@/domain/data";
 import {
   GeoCoordinates,
-  useDataCubeMetadataQuery,
   useDataCubeObservationsQuery,
   useDataCubesComponentsQuery,
+  useDataCubesMetadataQuery,
   useGeoCoordinatesByDimensionIriQuery,
   useGeoShapesByDimensionIriQuery,
 } from "@/graphql/query-hooks";
@@ -46,10 +46,10 @@ export const ChartMapVisualization = ({
     sourceUrl: dataSource.url,
     locale,
   };
-  const [metadataQuery] = useDataCubeMetadataQuery({
+  const [metadataQuery] = useDataCubesMetadataQuery({
     variables: {
       ...commonQueryVariables,
-      iri: dataSetIri,
+      filters: [{ iri: dataSetIri }],
     },
   });
   const [componentsQuery] = useDataCubesComponentsQuery({
diff --git a/app/charts/pie/chart-pie.tsx b/app/charts/pie/chart-pie.tsx
index e354edc4c..9e7581120 100644
--- a/app/charts/pie/chart-pie.tsx
+++ b/app/charts/pie/chart-pie.tsx
@@ -14,9 +14,9 @@ import { OnlyNegativeDataHint } from "@/components/hint";
 import { DataSource, PieConfig, QueryFilters } from "@/config-types";
 import { TimeSlider } from "@/configurator/interactive-filters/time-slider";
 import {
-  useDataCubeMetadataQuery,
   useDataCubeObservationsQuery,
   useDataCubesComponentsQuery,
+  useDataCubesMetadataQuery,
 } from "@/graphql/query-hooks";
 import { useLocale } from "@/locales/use-locale";
 
@@ -41,10 +41,10 @@ export const ChartPieVisualization = ({
     sourceUrl: dataSource.url,
     locale,
   };
-  const [metadataQuery] = useDataCubeMetadataQuery({
+  const [metadataQuery] = useDataCubesMetadataQuery({
     variables: {
       ...commonQueryVariables,
-      iri: dataSetIri,
+      filters: [{ iri: dataSetIri }],
     },
   });
   const [componentsQuery] = useDataCubesComponentsQuery({
diff --git a/app/charts/scatterplot/chart-scatterplot.tsx b/app/charts/scatterplot/chart-scatterplot.tsx
index 167a3e9e5..cf0ea7b3d 100644
--- a/app/charts/scatterplot/chart-scatterplot.tsx
+++ b/app/charts/scatterplot/chart-scatterplot.tsx
@@ -22,9 +22,9 @@ import { InteractionVoronoi } from "@/charts/shared/overlay-voronoi";
 import { DataSource, QueryFilters, ScatterPlotConfig } from "@/config-types";
 import { TimeSlider } from "@/configurator/interactive-filters/time-slider";
 import {
-  useDataCubeMetadataQuery,
   useDataCubeObservationsQuery,
   useDataCubesComponentsQuery,
+  useDataCubesMetadataQuery,
 } from "@/graphql/query-hooks";
 import { useLocale } from "@/locales/use-locale";
 
@@ -49,10 +49,10 @@ export const ChartScatterplotVisualization = ({
     sourceUrl: dataSource.url,
     locale,
   };
-  const [metadataQuery] = useDataCubeMetadataQuery({
+  const [metadataQuery] = useDataCubesMetadataQuery({
     variables: {
       ...commonQueryVariables,
-      iri: dataSetIri,
+      filters: [{ iri: dataSetIri }],
     },
   });
   const [componentsQuery] = useDataCubesComponentsQuery({
diff --git a/app/charts/table/chart-table.tsx b/app/charts/table/chart-table.tsx
index bc51c4e81..7fc7f02dd 100644
--- a/app/charts/table/chart-table.tsx
+++ b/app/charts/table/chart-table.tsx
@@ -5,9 +5,9 @@ import { Table } from "@/charts/table/table";
 import { TableChart } from "@/charts/table/table-state";
 import { DataSource, TableConfig } from "@/configurator";
 import {
-  useDataCubeMetadataQuery,
   useDataCubeObservationsQuery,
   useDataCubesComponentsQuery,
+  useDataCubesMetadataQuery,
 } from "@/graphql/query-hooks";
 import { useLocale } from "@/locales/use-locale";
 
@@ -30,10 +30,10 @@ export const ChartTableVisualization = ({
     sourceUrl: dataSource.url,
     locale,
   };
-  const [metadataQuery] = useDataCubeMetadataQuery({
+  const [metadataQuery] = useDataCubesMetadataQuery({
     variables: {
       ...commonQueryVariables,
-      iri: dataSetIri,
+      filters: [{ iri: dataSetIri }],
     },
   });
   const [componentsQuery] = useDataCubesComponentsQuery({
diff --git a/app/components/chart-footnotes.tsx b/app/components/chart-footnotes.tsx
index 0ebadd9de..1a82d3450 100644
--- a/app/components/chart-footnotes.tsx
+++ b/app/components/chart-footnotes.tsx
@@ -1,7 +1,7 @@
 import { Trans } from "@lingui/macro";
 import { Box, Button, Link, Theme, Typography } from "@mui/material";
 import { makeStyles } from "@mui/styles";
-import { PropsWithChildren, useEffect, useMemo, useState } from "react";
+import { PropsWithChildren, useEffect, useState } from "react";
 
 import {
   extractChartConfigComponentIris,
@@ -12,8 +12,8 @@ import { DataDownloadMenu, RunSparqlQuery } from "@/components/data-download";
 import { ChartConfig, DataSource } from "@/configurator";
 import { useTimeFormatLocale } from "@/formatters";
 import {
-  useDataCubeMetadataQuery,
   useDataCubeObservationsQuery,
+  useDataCubesMetadataQuery,
 } from "@/graphql/query-hooks";
 import { Icon, getChartIcon } from "@/icons";
 import { useLocale } from "@/locales/use-locale";
@@ -70,13 +70,15 @@ export const ChartFootnotes = ({
   }, [configKey, locale]);
 
   const commonQueryVariables = {
-    iri: dataSetIri,
     sourceType: dataSource.type,
     sourceUrl: dataSource.url,
     locale,
   };
-  const [{ data }] = useDataCubeMetadataQuery({
-    variables: commonQueryVariables,
+  const [{ data }] = useDataCubesMetadataQuery({
+    variables: {
+      ...commonQueryVariables,
+      filters: [{ iri: dataSetIri }],
+    },
   });
   // Data for data download
   const filters = useQueryFilters({ chartConfig });
@@ -84,6 +86,7 @@ export const ChartFootnotes = ({
   const [{ data: visibleData }] = useDataCubeObservationsQuery({
     variables: {
       ...commonQueryVariables,
+      iri: dataSetIri,
       componentIris,
       filters,
     },
@@ -92,9 +95,6 @@ export const ChartFootnotes = ({
     visibleData?.dataCubeByIri?.observations.sparqlEditorUrl;
 
   const formatLocale = useTimeFormatLocale();
-  const cubeLink = useMemo(() => {
-    return makeOpenDataLink(locale, data?.dataCubeByIri);
-  }, [locale, data?.dataCubeByIri]);
 
   const [
     {
@@ -108,141 +108,166 @@ export const ChartFootnotes = ({
     },
   ] = useEmbedOptions();
 
-  if (data?.dataCubeByIri) {
-    const { dataCubeByIri } = data;
+  return (
+    <>
+      {data?.dataCubesMetadata
+        ? data.dataCubesMetadata.map((dataCubeMetadata) => {
+            const cubeLink = makeOpenDataLink(locale, dataCubeMetadata);
 
-    return (
-      <Box sx={{ mt: 2 }}>
-        {showDatasetTitle !== false ? (
-          <Typography component="span" variant="caption" color="grey.600">
-            <strong>
-              <Trans id="dataset.footnotes.dataset">Dataset</Trans>
-            </strong>
-            <Trans id="typography.colon">: </Trans>
-            {cubeLink ? (
-              <Link target="_blank" href={cubeLink} rel="noreferrer">
-                {dataCubeByIri.title}{" "}
-                <Icon
-                  name="linkExternal"
-                  size="1em"
-                  style={{ display: "inline" }}
-                />
-              </Link>
-            ) : (
-              dataCubeByIri.title
-            )}
-          </Typography>
-        ) : null}
+            return (
+              <Box key={dataCubeMetadata.iri} sx={{ mt: 2 }}>
+                {showDatasetTitle !== false ? (
+                  <Typography
+                    component="span"
+                    variant="caption"
+                    color="grey.600"
+                  >
+                    <strong>
+                      <Trans id="dataset.footnotes.dataset">Dataset</Trans>
+                    </strong>
+                    <Trans id="typography.colon">: </Trans>
+                    {cubeLink ? (
+                      <Link target="_blank" href={cubeLink} rel="noreferrer">
+                        {dataCubeMetadata.title}{" "}
+                        <Icon
+                          name="linkExternal"
+                          size="1em"
+                          style={{ display: "inline" }}
+                        />
+                      </Link>
+                    ) : (
+                      dataCubeMetadata.title
+                    )}
+                  </Typography>
+                ) : null}
 
-        {dataCubeByIri.dateModified && showDatePublished !== false ? (
-          <Typography component="span" variant="caption" color="grey.600">
-            ,&nbsp;
-            <strong>
-              <Trans id="dataset.footnotes.updated">Latest update</Trans>
-            </strong>
-            <Trans id="typography.colon">: </Trans>
-            {formatLocale.format("%d.%m.%Y %H:%M")(
-              new Date(dataCubeByIri.dateModified)
-            )}
-          </Typography>
-        ) : null}
+                {dataCubeMetadata.dateModified &&
+                showDatePublished !== false ? (
+                  <Typography
+                    component="span"
+                    variant="caption"
+                    color="grey.600"
+                  >
+                    ,&nbsp;
+                    <strong>
+                      <Trans id="dataset.footnotes.updated">
+                        Latest update
+                      </Trans>
+                    </strong>
+                    <Trans id="typography.colon">: </Trans>
+                    {formatLocale.format("%d.%m.%Y %H:%M")(
+                      new Date(dataCubeMetadata.dateModified)
+                    )}
+                  </Typography>
+                ) : null}
 
-        {showSource !== false ? (
-          <Typography component="div" variant="caption" color="grey.600">
-            <strong>
-              <Trans id="metadata.source">Source</Trans>
-            </strong>
-            <Trans id="typography.colon">: </Trans>
-            {dataCubeByIri.publisher && (
-              <Box
-                component="span"
-                sx={{ "> a": { color: "grey.600" } }}
-                dangerouslySetInnerHTML={{ __html: dataCubeByIri.publisher }}
-              ></Box>
-            )}
-            {configKey && shareUrl && visualizeLinkText && (
-              <>
-                {" "}
-                / <LinkButton href={shareUrl}> {visualizeLinkText}</LinkButton>
-              </>
-            )}
-          </Typography>
-        ) : null}
+                {showSource !== false ? (
+                  <Typography
+                    component="div"
+                    variant="caption"
+                    color="grey.600"
+                  >
+                    <strong>
+                      <Trans id="metadata.source">Source</Trans>
+                    </strong>
+                    <Trans id="typography.colon">: </Trans>
+                    {dataCubeMetadata.publisher && (
+                      <Box
+                        component="span"
+                        sx={{ "> a": { color: "grey.600" } }}
+                        dangerouslySetInnerHTML={{
+                          __html: dataCubeMetadata.publisher,
+                        }}
+                      />
+                    )}
+                    {configKey && shareUrl && visualizeLinkText && (
+                      <>
+                        {" "}
+                        /{" "}
+                        <LinkButton href={shareUrl}>
+                          {" "}
+                          {visualizeLinkText}
+                        </LinkButton>
+                      </>
+                    )}
+                  </Typography>
+                ) : null}
 
-        <Box className={classes.actions}>
-          {showDownload !== false ? (
-            <DataDownloadMenu
-              dataSetIri={dataSetIri}
-              dataSource={dataSource}
-              title={dataCubeByIri.title}
-              filters={filters}
-            />
-          ) : null}
-          {showTableSwitch !== false ? (
-            <>
-              {chartConfig.chartType !== "table" && (
-                <Button
-                  component="a"
-                  color="primary"
-                  variant="text"
-                  size="small"
-                  startIcon={
-                    <Icon
-                      name={
-                        isTablePreview
-                          ? getChartIcon(chartConfig.chartType)
-                          : "table"
-                      }
+                <Box className={classes.actions}>
+                  {showDownload !== false ? (
+                    <DataDownloadMenu
+                      dataSetIri={dataSetIri}
+                      dataSource={dataSource}
+                      title={dataCubeMetadata.title}
+                      filters={filters}
                     />
-                  }
-                  onClick={onToggleTableView}
-                  sx={{ p: 0, typography: "caption" }}
-                >
-                  {isTablePreview ? (
-                    <Trans id="metadata.switch.chart">
-                      Switch to chart view
-                    </Trans>
-                  ) : (
-                    <Trans id="metadata.switch.table">
-                      Switch to table view
-                    </Trans>
+                  ) : null}
+                  {showTableSwitch !== false ? (
+                    <>
+                      {chartConfig.chartType !== "table" && (
+                        <Button
+                          component="a"
+                          color="primary"
+                          variant="text"
+                          size="small"
+                          startIcon={
+                            <Icon
+                              name={
+                                isTablePreview
+                                  ? getChartIcon(chartConfig.chartType)
+                                  : "table"
+                              }
+                            />
+                          }
+                          onClick={onToggleTableView}
+                          sx={{ p: 0, typography: "caption" }}
+                        >
+                          {isTablePreview ? (
+                            <Trans id="metadata.switch.chart">
+                              Switch to chart view
+                            </Trans>
+                          ) : (
+                            <Trans id="metadata.switch.table">
+                              Switch to table view
+                            </Trans>
+                          )}
+                        </Button>
+                      )}
+                    </>
+                  ) : null}
+                  {dataCubeMetadata.landingPage && showLandingPage !== false && (
+                    <Button
+                      variant="text"
+                      component="a"
+                      href={dataCubeMetadata.landingPage}
+                      target="_blank"
+                      color="primary"
+                      size="small"
+                      sx={{ p: 0, typography: "caption" }}
+                      startIcon={<Icon name="linkExternal" />}
+                    >
+                      <Trans id="dataset.metadata.learnmore">
+                        Learn more about the dataset
+                      </Trans>
+                    </Button>
                   )}
-                </Button>
-              )}
-            </>
-          ) : null}
-          {dataCubeByIri.landingPage && showLandingPage !== false && (
-            <Button
-              variant="text"
-              component="a"
-              href={dataCubeByIri.landingPage}
-              target="_blank"
-              color="primary"
-              size="small"
-              sx={{ p: 0, typography: "caption" }}
-              startIcon={<Icon name="linkExternal" />}
-            >
-              <Trans id="dataset.metadata.learnmore">
-                Learn more about the dataset
-              </Trans>
-            </Button>
-          )}
-          {sparqlEditorUrl && showSparqlQuery !== false && (
-            <RunSparqlQuery url={sparqlEditorUrl as string} />
-          )}
-          {configKey && shareUrl && !visualizeLinkText && (
-            <LinkButton href={shareUrl}>
-              <Trans id="metadata.link.created.with.visualize">
-                Created with visualize.admin.ch
-              </Trans>
-            </LinkButton>
-          )}
-        </Box>
-      </Box>
-    );
-  } else {
-    return null;
-  }
+                  {sparqlEditorUrl && showSparqlQuery !== false && (
+                    <RunSparqlQuery url={sparqlEditorUrl as string} />
+                  )}
+                  {configKey && shareUrl && !visualizeLinkText && (
+                    <LinkButton href={shareUrl}>
+                      <Trans id="metadata.link.created.with.visualize">
+                        Created with visualize.admin.ch
+                      </Trans>
+                    </LinkButton>
+                  )}
+                </Box>
+              </Box>
+            );
+          })
+        : null}
+    </>
+  );
 };
 
 const LinkButton = (props: PropsWithChildren<{ href: string }>) => {
diff --git a/app/components/chart-preview.tsx b/app/components/chart-preview.tsx
index c0e6462db..faae469a9 100644
--- a/app/components/chart-preview.tsx
+++ b/app/components/chart-preview.tsx
@@ -22,8 +22,8 @@ import {
   useConfiguratorState,
 } from "@/configurator";
 import {
-  useDataCubeMetadataQuery,
   useDataCubesComponentsQuery,
+  useDataCubesMetadataQuery,
 } from "@/graphql/query-hooks";
 import { DataCubePublicationStatus } from "@/graphql/resolver-types";
 import { useLocale } from "@/locales/use-locale";
@@ -67,21 +67,17 @@ export const ChartPreviewInner = (props: ChartPreviewProps) => {
   const chartConfig = getChartConfig(state);
   const locale = useLocale();
   const classes = useStyles();
-  const [{ data: metadata }] = useDataCubeMetadataQuery({
-    variables: {
-      iri: dataSetIri,
-      sourceType: dataSource.type,
-      sourceUrl: dataSource.url,
-      locale,
-    },
+  const commonQueryVariables = {
+    sourceType: dataSource.type,
+    sourceUrl: dataSource.url,
+    locale,
+    filters: [{ iri: dataSetIri }],
+  };
+  const [{ data: metadata }] = useDataCubesMetadataQuery({
+    variables: commonQueryVariables,
   });
   const [{ data: components }] = useDataCubesComponentsQuery({
-    variables: {
-      sourceType: dataSource.type,
-      sourceUrl: dataSource.url,
-      locale,
-      filters: [{ iri: dataSetIri }],
-    },
+    variables: commonQueryVariables,
   });
   const {
     state: isTablePreview,
@@ -115,8 +111,10 @@ export const ChartPreviewInner = (props: ChartPreviewProps) => {
       }}
     >
       <ChartErrorBoundary resetKeys={[state]}>
-        {metadata?.dataCubeByIri?.publicationStatus ===
-          DataCubePublicationStatus.Draft && (
+        {/* FIXME: adapt to design */}
+        {metadata?.dataCubesMetadata.some(
+          (d) => d.publicationStatus === DataCubePublicationStatus.Draft
+        ) && (
           <Box sx={{ mb: 4 }}>
             <HintYellow iconName="datasetError" iconSize={64}>
               <Trans id="dataset.publicationStatus.draft.warning">
@@ -171,7 +169,8 @@ export const ChartPreviewInner = (props: ChartPreviewProps) => {
               <Head>
                 <title key="title">
                   {chartConfig.meta.title[locale] === ""
-                    ? metadata?.dataCubeByIri?.title
+                    ? // FIXME: adapt to design
+                      metadata?.dataCubesMetadata.map((d) => d.title).join(", ")
                     : chartConfig.meta.title[locale]}{" "}
                   - visualize.admin.ch
                 </title>
diff --git a/app/components/chart-published.tsx b/app/components/chart-published.tsx
index 2bf81cd43..dd71f27e1 100644
--- a/app/components/chart-published.tsx
+++ b/app/components/chart-published.tsx
@@ -35,8 +35,8 @@ import {
   useIsTrustedDataSource,
 } from "@/domain/datasource";
 import {
-  useDataCubeMetadataQuery,
   useDataCubesComponentsQuery,
+  useDataCubesMetadataQuery,
 } from "@/graphql/query-hooks";
 import { DataCubePublicationStatus } from "@/graphql/resolver-types";
 import { useLocale } from "@/locales/use-locale";
@@ -137,10 +137,12 @@ const ChartPublishedInner = (props: ChartPublishInnerProps) => {
     sourceUrl: dataSource.url,
     locale,
   };
-  const [{ data: metadata }] = useDataCubeMetadataQuery({
+  const [{ data: metadata }] = useDataCubesMetadataQuery({
     variables: {
-      ...commonQueryVariables,
-      iri: chartConfig.dataSet,
+      sourceType: dataSource.type,
+      sourceUrl: dataSource.url,
+      locale,
+      filters: [{ iri: chartConfig.dataSet }],
     },
   });
   const componentIris = extractChartConfigsComponentIris(state.chartConfigs);
@@ -169,8 +171,9 @@ const ChartPublishedInner = (props: ChartPublishInnerProps) => {
     <MetadataPanelStoreContext.Provider value={metadataPanelStore}>
       <Box className={classes.root} ref={rootRef}>
         <ChartErrorBoundary resetKeys={[chartConfig]}>
-          {metadata?.dataCubeByIri?.publicationStatus ===
-            DataCubePublicationStatus.Draft && (
+          {metadata?.dataCubesMetadata.some(
+            (d) => d.publicationStatus === DataCubePublicationStatus.Draft
+          ) && (
             <Box sx={{ mb: 4 }}>
               <HintRed iconName="datasetError" iconSize={64}>
                 <Trans id="dataset.publicationStatus.draft.warning">
@@ -181,7 +184,7 @@ const ChartPublishedInner = (props: ChartPublishInnerProps) => {
               </HintRed>
             </Box>
           )}
-          {metadata?.dataCubeByIri?.expires && (
+          {metadata?.dataCubesMetadata.some((d) => d.expires) && (
             <Box sx={{ mb: 4 }}>
               <HintRed iconName="datasetError" iconSize={64}>
                 <Trans id="dataset.publicationStatus.expires.warning">
diff --git a/app/components/chart-selection-tabs.tsx b/app/components/chart-selection-tabs.tsx
index 0254e3621..84330df3e 100644
--- a/app/components/chart-selection-tabs.tsx
+++ b/app/components/chart-selection-tabs.tsx
@@ -19,10 +19,7 @@ import {
 } from "@/configurator";
 import { ChartTypeSelector } from "@/configurator/components/chart-type-selector";
 import { getIconName } from "@/configurator/components/ui-helpers";
-import {
-  useDataCubeMetadataQuery,
-  useDataCubesComponentsQuery,
-} from "@/graphql/query-hooks";
+import { useDataCubesComponentsQuery } from "@/graphql/query-hooks";
 import { Icon, IconName } from "@/icons";
 import { useLocale } from "@/src";
 import { fetchChartConfig } from "@/utils/chart-config/api";
@@ -260,21 +257,13 @@ const PublishChartButton = () => {
     sourceType: state.dataSource.type,
     sourceUrl: state.dataSource.url,
     locale,
+    filters: [{ iri: chartConfig.dataSet }],
   };
-  const [{ data: metadata }] = useDataCubeMetadataQuery({
-    variables: {
-      ...commonQueryVariables,
-      iri: chartConfig.dataSet,
-    },
-  });
   const [{ data: components }] = useDataCubesComponentsQuery({
-    variables: {
-      ...commonQueryVariables,
-      filters: [{ iri: chartConfig.dataSet }],
-    },
+    variables: commonQueryVariables,
   });
   const goNext = useEvent(() => {
-    if (metadata?.dataCubeByIri && components?.dataCubesComponents) {
+    if (components?.dataCubesComponents) {
       dispatch({
         type: "STEP_NEXT",
         dataCubesComponents: components.dataCubesComponents,
@@ -301,7 +290,7 @@ const PublishChartButton = () => {
     <Button
       color="primary"
       variant="contained"
-      onClick={metadata && components ? goNext : undefined}
+      onClick={components ? goNext : undefined}
       sx={{ minWidth: "fit-content" }}
     >
       {editingPublishedChart ? (
diff --git a/app/components/dataset-metadata.tsx b/app/components/dataset-metadata.tsx
index 82c8604fa..b6be1d001 100644
--- a/app/components/dataset-metadata.tsx
+++ b/app/components/dataset-metadata.tsx
@@ -13,12 +13,9 @@ import React, { ReactNode } from "react";
 
 import Tag from "@/components/tag";
 import { DataSource } from "@/config-types";
-import { truthy } from "@/domain/types";
+import { DataCubeMetadata } from "@/domain/data";
 import { useFormatDate } from "@/formatters";
-import {
-  DataCubeMetadataQuery,
-  useDataCubeMetadataQuery,
-} from "@/graphql/query-hooks";
+import { useDataCubesMetadataQuery } from "@/graphql/query-hooks";
 import { Icon } from "@/icons";
 import { useLocale } from "@/locales/use-locale";
 import { makeOpenDataLink } from "@/utils/opendata";
@@ -32,16 +29,17 @@ export const DataSetMetadata = ({
 }) => {
   const locale = useLocale();
   const formatDate = useFormatDate();
-  const [{ data, fetching, error }] = useDataCubeMetadataQuery({
+  const [{ data, fetching, error }] = useDataCubesMetadataQuery({
     variables: {
-      iri: dataSetIri,
       sourceType: dataSource.type,
       sourceUrl: dataSource.url,
       locale,
+      filters: [{ iri: dataSetIri }],
     },
   });
-  const cube = data?.dataCubeByIri;
-  const openDataLink = makeOpenDataLink(locale, cube);
+  // FIXME: adapt to design
+  const cube = data?.dataCubesMetadata[0];
+  const openDataLink = cube ? makeOpenDataLink(locale, cube) : null;
   if (fetching || error || !cube) {
     // The error and loading are managed by the component
     // displayed in the middle panel
@@ -83,10 +81,10 @@ export const DataSetMetadata = ({
         <Trans id="dataset.metadata.email">Contact points</Trans>
       </DatasetMetadataTitle>
       <DatasetMetadataBody>
-        {cube.contactEmail ? (
+        {cube.contactPoint?.email && cube.contactPoint.name ? (
           <DatasetMetadataLink
-            href={`mailto:${cube.contactEmail}`}
-            label={cube.contactName ?? cube.contactEmail}
+            href={`mailto:${cube.contactPoint.email}`}
+            label={cube.contactPoint.name ?? cube.contactPoint.email}
           />
         ) : (
           "–"
@@ -171,48 +169,65 @@ const DatasetMetadataLink = ({
   </Link>
 );
 
-const DatasetTags = ({
-  cube,
-}: {
-  cube: NonNullable<DataCubeMetadataQuery["dataCubeByIri"]>;
-}) => {
+const DatasetTags = ({ cube }: { cube: DataCubeMetadata }) => {
   return (
     <>
       <DatasetMetadataTitle>
         <Trans id="dataset-preview.keywords">Keywords</Trans>
       </DatasetMetadataTitle>
       <Stack spacing={1} direction="column" sx={{ mt: 3 }}>
-        {[cube.creator, ...cube.themes].filter(truthy).map((t) => {
-          const type =
-            t.__typename === "DataCubeTheme" ? "theme" : "organization";
-
-          return t.label ? (
-            <NextLink
-              key={t.iri}
-              href={`/browse/${type}/${encodeURIComponent(t.iri)}`}
-              passHref
-              legacyBehavior
-            >
-              <Tag
-                component={MUILink}
-                // @ts-ignore
-                underline="none"
-                type={type}
-                title={t.label || undefined}
-                sx={{
-                  maxWidth: "100%",
-                  display: "flex",
-                  whiteSpace: "nowrap",
-                  textOverflow: "ellipsis",
-                  overflow: "hidden",
-                }}
-              >
-                {t.label}
-              </Tag>
-            </NextLink>
-          ) : null;
-        })}
+        {cube.creator?.iri && (
+          <DatasetMetadataTag
+            type="organization"
+            iri={cube.creator.iri}
+            label={cube.creator.label}
+          />
+        )}
+        {cube.themes?.map((t) => (
+          <DatasetMetadataTag
+            key={t.iri}
+            type="theme"
+            iri={t.iri}
+            label={t.label}
+          />
+        ))}
       </Stack>
     </>
   );
 };
+
+type DatasetMetadataTagProps = {
+  type: "organization" | "theme";
+  iri: string;
+  label?: string | null;
+};
+
+const DatasetMetadataTag = (props: DatasetMetadataTagProps) => {
+  const { type, iri, label } = props;
+
+  return (
+    <NextLink
+      key={iri}
+      href={`/browse/${type}/${encodeURIComponent(iri)}`}
+      passHref
+      legacyBehavior
+    >
+      <Tag
+        component={MUILink}
+        // @ts-ignore
+        underline="none"
+        type={type}
+        title={label ?? undefined}
+        sx={{
+          maxWidth: "100%",
+          display: "flex",
+          whiteSpace: "nowrap",
+          textOverflow: "ellipsis",
+          overflow: "hidden",
+        }}
+      >
+        {label}
+      </Tag>
+    </NextLink>
+  );
+};
diff --git a/app/configurator/components/chart-configurator.tsx b/app/configurator/components/chart-configurator.tsx
index 014686def..d8e3e3b84 100644
--- a/app/configurator/components/chart-configurator.tsx
+++ b/app/configurator/components/chart-configurator.tsx
@@ -73,11 +73,9 @@ import {
   Measure,
 } from "@/domain/data";
 import {
-  DataCubeMetadataQuery,
   PossibleFiltersDocument,
   PossibleFiltersQuery,
   PossibleFiltersQueryVariables,
-  useDataCubeMetadataQuery,
   useDataCubeObservationsQuery,
   useDataCubesComponentsQuery,
 } from "@/graphql/query-hooks";
@@ -279,12 +277,6 @@ const useFilterReorder = ({
     unmappedFilters,
   ]);
 
-  const [
-    { data: metadataData, fetching: metadataFetching },
-    executeMetadataQuery,
-  ] = useDataCubeMetadataQuery({
-    variables,
-  });
   const [
     { data: componentsData, fetching: componentsFetching },
     exectueComponentsQuery,
@@ -300,7 +292,6 @@ const useFilterReorder = ({
   });
 
   useEffect(() => {
-    executeMetadataQuery({ variables });
     exectueComponentsQuery({
       variables: {
         sourceType: state.dataSource.type,
@@ -313,7 +304,6 @@ const useFilterReorder = ({
     });
   }, [
     variables,
-    executeMetadataQuery,
     exectueComponentsQuery,
     state.dataSource.type,
     state.dataSource.url,
@@ -321,13 +311,12 @@ const useFilterReorder = ({
     chartConfig.dataSet,
   ]);
 
-  const metadata = metadataData?.dataCubeByIri;
   const dimensions = componentsData?.dataCubesComponents?.dimensions;
   const measures = componentsData?.dataCubesComponents?.measures;
 
   // Handlers
   const handleMove = useEvent((dimensionIri: string, delta: number) => {
-    if (!metadata || !dimensions || !measures) {
+    if (!dimensions || !measures) {
       return;
     }
 
@@ -342,7 +331,6 @@ const useFilterReorder = ({
       type: "CHART_CONFIG_REPLACED",
       value: {
         chartConfig: newChartConfig,
-        dataCubeMetadata: metadata,
         dataCubesComponents: {
           dimensions,
           measures,
@@ -389,8 +377,7 @@ const useFilterReorder = ({
   const { fetching: possibleFiltersFetching } = useEnsurePossibleFilters({
     state,
   });
-  const fetching =
-    possibleFiltersFetching || metadataFetching || componentsFetching;
+  const fetching = possibleFiltersFetching || componentsFetching;
 
   const { filterDimensions, addableDimensions } = useMemo(() => {
     const keysOrder = Object.fromEntries(
@@ -422,7 +409,6 @@ const useFilterReorder = ({
     handleMove,
     handleDragEnd,
     fetching,
-    metadata,
     dimensions,
     measures,
     filterDimensions,
@@ -556,7 +542,6 @@ export const ChartConfigurator = ({
     handleAddDimensionFilter,
     handleRemoveDimensionFilter,
     handleDragEnd,
-    metadata,
     dimensions,
     measures,
     filterDimensions,
@@ -575,7 +560,7 @@ export const ChartConfigurator = ({
 
   const classes = useStyles({ fetching });
 
-  if (!metadata || !dimensions || !measures) {
+  if (!dimensions || !measures) {
     return (
       <>
         <ControlSectionSkeleton />
@@ -612,7 +597,6 @@ export const ChartConfigurator = ({
           <ChartFields
             dataSource={state.dataSource}
             chartConfig={chartConfig}
-            metadata={metadata}
             dimensions={dimensions}
             measures={measures}
           />
@@ -762,13 +746,12 @@ export const ChartConfigurator = ({
 type ChartFieldsProps = {
   dataSource: DataSource;
   chartConfig: ChartConfig;
-  metadata: NonNullable<DataCubeMetadataQuery["dataCubeByIri"]>;
   dimensions: Dimension[];
   measures: Measure[];
 };
 
 const ChartFields = (props: ChartFieldsProps) => {
-  const { dataSource, chartConfig, metadata, dimensions, measures } = props;
+  const { dataSource, chartConfig, dimensions, measures } = props;
   const components = [...dimensions, ...measures];
   const queryFilters = useQueryFilters({ chartConfig });
   const locale = useLocale();
@@ -776,7 +759,7 @@ const ChartFields = (props: ChartFieldsProps) => {
   const [{ data: observationsData }] = useDataCubeObservationsQuery({
     variables: {
       locale,
-      iri: metadata.iri,
+      iri: chartConfig.dataSet,
       sourceType: dataSource.type,
       sourceUrl: dataSource.url,
       componentIris: components.map((d) => d.iri),
diff --git a/app/configurator/components/chart-options-selector.tsx b/app/configurator/components/chart-options-selector.tsx
index c12cecd88..30c8f23de 100644
--- a/app/configurator/components/chart-options-selector.tsx
+++ b/app/configurator/components/chart-options-selector.tsx
@@ -80,7 +80,6 @@ import {
   Observation,
 } from "@/domain/data";
 import {
-  useDataCubeMetadataQuery,
   useDataCubeObservationsQuery,
   useDataCubesComponentsQuery,
 } from "@/graphql/query-hooks";
@@ -103,9 +102,6 @@ export const ChartOptionsSelector = ({
     sourceUrl: dataSource.url,
     locale,
   };
-  const [{ data: metadataData }] = useDataCubeMetadataQuery({
-    variables: commonVariables,
-  });
   const [{ data: componentsData }] = useDataCubesComponentsQuery({
     variables: {
       sourceType: dataSource.type,
@@ -121,12 +117,11 @@ export const ChartOptionsSelector = ({
     },
   });
 
-  const metadata = metadataData?.dataCubeByIri;
   const dimensions = componentsData?.dataCubesComponents.dimensions;
   const measures = componentsData?.dataCubesComponents.measures;
   const observations = observationsData?.dataCubeByIri?.observations.data;
 
-  return metadata && dimensions && measures && observations ? (
+  return dimensions && measures && observations ? (
     <Box
       sx={{
         // we need these overflow parameters to allow iOS scrolling
@@ -138,7 +133,6 @@ export const ChartOptionsSelector = ({
         isTableConfig(chartConfig) ? (
           <TableColumnOptions
             state={state}
-            metadata={metadata}
             dimensions={dimensions}
             measures={measures}
           />
diff --git a/app/configurator/configurator-state.tsx b/app/configurator/configurator-state.tsx
index 5a1ba7d61..aaff7e4c5 100644
--- a/app/configurator/configurator-state.tsx
+++ b/app/configurator/configurator-state.tsx
@@ -62,9 +62,6 @@ import {
 import { DEFAULT_DATA_SOURCE } from "@/domain/datasource";
 import { client } from "@/graphql/client";
 import {
-  DataCubeMetadataDocument,
-  DataCubeMetadataQuery,
-  DataCubeMetadataQueryVariables,
   DataCubesComponentsDocument,
   DataCubesComponentsQuery,
   DataCubesComponentsQueryVariables,
@@ -195,7 +192,6 @@ export type ConfiguratorStateAction =
       type: "CHART_CONFIG_REPLACED";
       value: {
         chartConfig: ChartConfig;
-        dataCubeMetadata: NonNullable<DataCubeMetadataQuery["dataCubeByIri"]>;
         dataCubesComponents: DataCubesComponents;
       };
     }
@@ -357,24 +353,11 @@ const EMPTY_STATE: ConfiguratorStateSelectingDataSet = {
   activeChartKey: undefined,
 };
 
-const getCachedMetadata = (
+const getCachedComponents = (
   draft: ConfiguratorStateConfiguringChart,
   dataSet: string,
   locale: Locale
-): {
-  metadata: NonNullable<DataCubeMetadataQuery["dataCubeByIri"]>;
-  components: DataCubesComponents;
-} | null => {
-  const metadataQuery = client.readQuery<
-    DataCubeMetadataQuery,
-    DataCubeMetadataQueryVariables
-  >(DataCubeMetadataDocument, {
-    iri: dataSet,
-    locale,
-    sourceType: draft.dataSource.type,
-    sourceUrl: draft.dataSource.url,
-  });
-  // Some charts use hierarchical query, so we need to check for both.
+): DataCubesComponents | undefined => {
   const componentsQuery = client.readQuery<
     DataCubesComponentsQuery,
     DataCubesComponentsQueryVariables
@@ -385,13 +368,7 @@ const getCachedMetadata = (
     filters: [{ iri: dataSet }],
   });
 
-  return metadataQuery?.data?.dataCubeByIri &&
-    componentsQuery?.data?.dataCubesComponents
-    ? {
-        metadata: metadataQuery.data.dataCubeByIri,
-        components: componentsQuery.data.dataCubesComponents,
-      }
-    : null;
+  return componentsQuery?.data?.dataCubesComponents;
 };
 
 export const getFilterValue = (
@@ -778,8 +755,11 @@ export const handleChartFieldChanged = (
     selectedValues: actionSelectedValues,
   } = action.value;
   const f = get(chartConfig.fields, field);
-  const { components: dataCubesComponents } =
-    getCachedMetadata(draft, chartConfig.dataSet, locale) ?? {};
+  const dataCubesComponents = getCachedComponents(
+    draft,
+    chartConfig.dataSet,
+    locale
+  );
   const dimensions = dataCubesComponents?.dimensions ?? [];
   const measures = dataCubesComponents?.measures ?? [];
   const components = [...dimensions, ...measures];
@@ -829,8 +809,11 @@ export const handleChartOptionChanged = (
     const { locale, path, field, value } = action.value;
     const chartConfig = getChartConfig(draft);
     const updatePath = field === null ? path : `fields["${field}"].${path}`;
-    const { components: dataCubesComponents } =
-      getCachedMetadata(draft, chartConfig.dataSet, locale) ?? {};
+    const dataCubesComponents = getCachedComponents(
+      draft,
+      chartConfig.dataSet,
+      locale
+    );
     const dimensions = dataCubesComponents?.dimensions ?? [];
     const measures = dataCubesComponents?.measures ?? [];
 
@@ -939,8 +922,11 @@ const reducer: Reducer<ConfiguratorState, ConfiguratorStateAction> = (
       if (draft.state === "CONFIGURING_CHART") {
         const { locale, chartKey, chartType } = action.value;
         const chartConfig = getChartConfig(draft, chartKey);
-        const { components: dataCubesComponents } =
-          getCachedMetadata(draft, chartConfig.dataSet, locale) ?? {};
+        const dataCubesComponents = getCachedComponents(
+          draft,
+          chartConfig.dataSet,
+          locale
+        );
         const dimensions = dataCubesComponents?.dimensions;
         const measures = dataCubesComponents?.measures;
 
@@ -979,9 +965,11 @@ const reducer: Reducer<ConfiguratorState, ConfiguratorStateAction> = (
       if (draft.state === "CONFIGURING_CHART") {
         const chartConfig = getChartConfig(draft);
         delete (chartConfig.fields as GenericFields)[action.value.field];
-        const { components: dataCubesComponents } =
-          getCachedMetadata(draft, chartConfig.dataSet, action.value.locale) ??
-          {};
+        const dataCubesComponents = getCachedComponents(
+          draft,
+          chartConfig.dataSet,
+          action.value.locale
+        );
         const dimensions = dataCubesComponents?.dimensions ?? [];
         deriveFiltersFromFields(chartConfig, dimensions);
 
@@ -1270,9 +1258,11 @@ const reducer: Reducer<ConfiguratorState, ConfiguratorStateAction> = (
     case "CHART_CONFIG_ADD":
       if (draft.state === "CONFIGURING_CHART") {
         const chartConfig = getChartConfig(draft);
-        const { components: dataCubesComponents } =
-          getCachedMetadata(draft, chartConfig.dataSet, action.value.locale) ??
-          {};
+        const dataCubesComponents = getCachedComponents(
+          draft,
+          chartConfig.dataSet,
+          action.value.locale
+        );
 
         if (dataCubesComponents) {
           draft.chartConfigs.push(
@@ -1362,17 +1352,6 @@ export const initChartStateFromCube = async (
   dataSource: DataSource,
   locale: string
 ): Promise<ConfiguratorState | undefined> => {
-  const { data: metadata } = await client
-    .query<DataCubeMetadataQuery, DataCubeMetadataQueryVariables>(
-      DataCubeMetadataDocument,
-      {
-        iri: datasetIri,
-        sourceType: dataSource.type,
-        sourceUrl: dataSource.url,
-        locale,
-      }
-    )
-    .toPromise();
   const { data: components } = await client
     .query<DataCubesComponentsQuery, DataCubesComponentsQueryVariables>(
       DataCubesComponentsDocument,
@@ -1385,7 +1364,7 @@ export const initChartStateFromCube = async (
     )
     .toPromise();
 
-  if (metadata?.dataCubeByIri && components?.dataCubesComponents) {
+  if (components?.dataCubesComponents) {
     return transitionStepNext(getStateWithCurrentDataSource(EMPTY_STATE), {
       dataCubesComponents: components.dataCubesComponents,
       dataSet: datasetIri,
diff --git a/app/configurator/table/table-chart-configurator.hook.tsx b/app/configurator/table/table-chart-configurator.hook.tsx
index 7b1f00dea..9dc93057d 100644
--- a/app/configurator/table/table-chart-configurator.hook.tsx
+++ b/app/configurator/table/table-chart-configurator.hook.tsx
@@ -11,10 +11,7 @@ import {
   useConfiguratorState,
 } from "@/configurator/configurator-state";
 import { moveFields } from "@/configurator/table/table-config-state";
-import {
-  useDataCubeMetadataQuery,
-  useDataCubesComponentsQuery,
-} from "@/graphql/query-hooks";
+import { useDataCubesComponentsQuery } from "@/graphql/query-hooks";
 import { useLocale } from "@/locales/use-locale";
 
 export const useTableChartController = (
@@ -23,14 +20,6 @@ export const useTableChartController = (
   const locale = useLocale();
   const [, dispatch] = useConfiguratorState(isConfiguring);
   const chartConfig = getChartConfig(state);
-  const [{ data: metadata }] = useDataCubeMetadataQuery({
-    variables: {
-      iri: chartConfig.dataSet,
-      sourceType: state.dataSource.type,
-      sourceUrl: state.dataSource.url,
-      locale,
-    },
-  });
   const [{ data: components }] = useDataCubesComponentsQuery({
     variables: {
       sourceType: state.dataSource.type,
@@ -57,7 +46,7 @@ export const useTableChartController = (
       if (
         !destination ||
         chartConfig.chartType !== "table" ||
-        !(metadata?.dataCubeByIri && components?.dataCubesComponents)
+        !components?.dataCubesComponents
       ) {
         return;
       }
@@ -71,17 +60,11 @@ export const useTableChartController = (
         type: "CHART_CONFIG_REPLACED",
         value: {
           chartConfig: newChartConfig,
-          dataCubeMetadata: metadata.dataCubeByIri,
           dataCubesComponents: components.dataCubesComponents,
         },
       });
     },
-    [
-      chartConfig,
-      components?.dataCubesComponents,
-      dispatch,
-      metadata?.dataCubeByIri,
-    ]
+    [chartConfig, components?.dataCubesComponents, dispatch]
   );
 
   const handleDragStart = useCallback<OnDragStartResponder>(
@@ -107,7 +90,6 @@ export const useTableChartController = (
   );
 
   return {
-    metadata,
     dimensions: components?.dataCubesComponents.dimensions,
     measures: components?.dataCubesComponents.measures,
     currentDraggableId,
diff --git a/app/configurator/table/table-chart-options.tsx b/app/configurator/table/table-chart-options.tsx
index d504be397..d3c3648cb 100644
--- a/app/configurator/table/table-chart-options.tsx
+++ b/app/configurator/table/table-chart-options.tsx
@@ -51,7 +51,6 @@ import {
   isTemporalDimension,
   Measure,
 } from "@/domain/data";
-import { DataCubeMetadataQuery } from "@/graphql/query-hooks";
 import {
   getDefaultCategoricalPalette,
   getDefaultCategoricalPaletteName,
@@ -61,13 +60,11 @@ import {
 const useTableColumnGroupHiddenField = ({
   path,
   field,
-  metadata,
   dimensions,
   measures,
 }: {
   path: "isGroup" | "isHidden";
   field: string;
-  metadata: DataCubeMetadataQuery["dataCubeByIri"];
   dimensions: Dimension[];
   measures: Measure[];
 }): FieldProps => {
@@ -75,7 +72,7 @@ const useTableColumnGroupHiddenField = ({
   const chartConfig = getChartConfig(state);
   const onChange = useCallback<(e: ChangeEvent<HTMLInputElement>) => void>(
     (e) => {
-      if (!isTableConfig(chartConfig) || !metadata) {
+      if (!isTableConfig(chartConfig)) {
         return;
       }
 
@@ -89,7 +86,6 @@ const useTableColumnGroupHiddenField = ({
         type: "CHART_CONFIG_REPLACED",
         value: {
           chartConfig: newChartConfig,
-          dataCubeMetadata: metadata,
           dataCubesComponents: {
             dimensions,
             measures,
@@ -97,7 +93,7 @@ const useTableColumnGroupHiddenField = ({
         },
       });
     },
-    [chartConfig, path, field, dispatch, metadata, dimensions, measures]
+    [chartConfig, path, field, dispatch, dimensions, measures]
   );
   const stateValue = get(chartConfig, `fields["${field}"].${path}`, "");
   const checked = stateValue ? stateValue : false;
@@ -115,7 +111,6 @@ const ChartOptionGroupHiddenField = ({
   path,
   defaultChecked,
   disabled = false,
-  metadata,
   dimensions,
   measures,
 }: {
@@ -124,14 +119,12 @@ const ChartOptionGroupHiddenField = ({
   path: "isGroup" | "isHidden";
   defaultChecked?: boolean;
   disabled?: boolean;
-  metadata: DataCubeMetadataQuery["dataCubeByIri"];
   dimensions: Dimension[];
   measures: Measure[];
 }) => {
   const fieldProps = useTableColumnGroupHiddenField({
     field,
     path,
-    metadata,
     dimensions,
     measures,
   });
@@ -148,12 +141,10 @@ const ChartOptionGroupHiddenField = ({
 
 export const TableColumnOptions = ({
   state,
-  metadata,
   dimensions,
   measures,
 }: {
   state: ConfiguratorStateConfiguringChart;
-  metadata: NonNullable<DataCubeMetadataQuery["dataCubeByIri"]>;
   dimensions: Dimension[];
   measures: Measure[];
 }) => {
@@ -177,7 +168,6 @@ export const TableColumnOptions = ({
     return (
       <TableSortingOptions
         state={state}
-        metadata={metadata}
         dimensions={dimensions}
         measures={measures}
       />
@@ -257,7 +247,6 @@ export const TableColumnOptions = ({
               })}
               field={activeField}
               path="isGroup"
-              metadata={metadata}
               dimensions={dimensions}
               measures={measures}
             />
@@ -269,7 +258,6 @@ export const TableColumnOptions = ({
             })}
             field={activeField}
             path="isHidden"
-            metadata={metadata}
             dimensions={dimensions}
             measures={measures}
           />
@@ -359,7 +347,7 @@ export const TableColumnOptions = ({
                 key={component.iri}
                 field={component.iri}
                 dimension={component}
-                dataSetIri={metadata.iri}
+                dataSetIri={chartConfig.dataSet}
                 colorComponent={component}
                 colorConfigPath="columnStyle"
               />
diff --git a/app/configurator/table/table-chart-sorting-options.tsx b/app/configurator/table/table-chart-sorting-options.tsx
index f6c807927..814280975 100644
--- a/app/configurator/table/table-chart-sorting-options.tsx
+++ b/app/configurator/table/table-chart-sorting-options.tsx
@@ -40,7 +40,6 @@ import {
   removeSortingOption,
 } from "@/configurator/table/table-config-state";
 import { Dimension, isNumericalMeasure, Measure } from "@/domain/data";
-import { DataCubeMetadataQuery } from "@/graphql/query-hooks";
 import { Icon } from "@/icons";
 import useEvent from "@/utils/use-event";
 
@@ -97,7 +96,6 @@ const useStyles = makeStyles<Theme>((theme) => ({
 }));
 
 const TableSortingOptionItem = ({
-  metadata,
   dimensions,
   measures,
   componentIri,
@@ -105,7 +103,6 @@ const TableSortingOptionItem = ({
   chartConfig,
   sortingOrder,
 }: {
-  metadata: DataCubeMetadataQuery["dataCubeByIri"];
   dimensions: Dimension[];
   measures: Measure[];
   index: number;
@@ -118,17 +115,12 @@ const TableSortingOptionItem = ({
   );
 
   const onRemove = useEvent(() => {
-    if (!metadata) {
-      return;
-    }
-
     dispatch({
       type: "CHART_CONFIG_REPLACED",
       value: {
         chartConfig: removeSortingOption(chartConfig, {
           index,
         }),
-        dataCubeMetadata: metadata,
         dataCubesComponents: {
           dimensions,
           measures,
@@ -138,10 +130,6 @@ const TableSortingOptionItem = ({
   });
 
   const onChangeSortingOrder = useEvent((e: ChangeEvent<HTMLInputElement>) => {
-    if (!metadata) {
-      return;
-    }
-
     dispatch({
       type: "CHART_CONFIG_REPLACED",
       value: {
@@ -149,7 +137,6 @@ const TableSortingOptionItem = ({
           index,
           sortingOrder: e.currentTarget.value as "asc" | "desc",
         }),
-        dataCubeMetadata: metadata,
         dataCubesComponents: {
           dimensions,
           measures,
@@ -167,7 +154,6 @@ const TableSortingOptionItem = ({
       <Typography variant="body1" className={classes.selectWrapper}>
         <ChangeTableSortingOption
           index={index}
-          metadata={metadata}
           dimensions={dimensions}
           measures={measures}
           chartConfig={chartConfig}
@@ -208,12 +194,10 @@ const TableSortingOptionItem = ({
 };
 
 const AddTableSortingOption = ({
-  metadata,
   dimensions,
   measures,
   chartConfig,
 }: {
-  metadata: DataCubeMetadataQuery["dataCubeByIri"];
   dimensions: Dimension[];
   measures: Measure[];
   chartConfig: TableConfig;
@@ -222,10 +206,6 @@ const AddTableSortingOption = ({
 
   const onChange = useCallback(
     (e: SelectChangeEvent<unknown>) => {
-      if (!metadata) {
-        return;
-      }
-
       const { value } = e.target;
       const component = [...dimensions, ...measures].find(
         ({ iri }) => iri === value
@@ -240,7 +220,6 @@ const AddTableSortingOption = ({
               componentType: component.__typename,
               sortingOrder: "asc",
             }),
-            dataCubeMetadata: metadata,
             dataCubesComponents: {
               dimensions,
               measures,
@@ -249,7 +228,7 @@ const AddTableSortingOption = ({
         });
       }
     },
-    [chartConfig, dimensions, dispatch, measures, metadata]
+    [chartConfig, dimensions, dispatch, measures]
   );
 
   const columns = useOrderedTableColumns(chartConfig.fields);
@@ -305,13 +284,11 @@ const AddTableSortingOption = ({
 };
 
 const ChangeTableSortingOption = ({
-  metadata,
   dimensions,
   measures,
   chartConfig,
   index,
 }: {
-  metadata: DataCubeMetadataQuery["dataCubeByIri"];
   dimensions: Dimension[];
   measures: Measure[];
   chartConfig: TableConfig;
@@ -321,10 +298,6 @@ const ChangeTableSortingOption = ({
 
   const onChange = useCallback(
     (e: SelectChangeEvent<unknown>) => {
-      if (!metadata) {
-        return;
-      }
-
       const { value } = e.target;
       const component = [...dimensions, ...measures].find(
         ({ iri }) => iri === value
@@ -342,7 +315,6 @@ const ChangeTableSortingOption = ({
                 sortingOrder: "asc",
               },
             }),
-            dataCubeMetadata: metadata,
             dataCubesComponents: {
               dimensions,
               measures,
@@ -351,7 +323,7 @@ const ChangeTableSortingOption = ({
         });
       }
     },
-    [chartConfig, dimensions, dispatch, index, measures, metadata]
+    [chartConfig, dimensions, dispatch, index, measures]
   );
 
   const columns = useOrderedTableColumns(chartConfig.fields);
@@ -383,12 +355,10 @@ const ChangeTableSortingOption = ({
 
 export const TableSortingOptions = ({
   state,
-  metadata,
   dimensions,
   measures,
 }: {
   state: ConfiguratorStateConfiguringChart;
-  metadata: DataCubeMetadataQuery["dataCubeByIri"];
   dimensions: Dimension[];
   measures: Measure[];
 }) => {
@@ -399,7 +369,7 @@ export const TableSortingOptions = ({
 
   const onDragEnd = useCallback<OnDragEndResponder>(
     ({ source, destination }) => {
-      if (!destination || chartConfig.chartType !== "table" || !metadata) {
+      if (!destination || chartConfig.chartType !== "table") {
         return;
       }
 
@@ -410,7 +380,6 @@ export const TableSortingOptions = ({
             source,
             destination,
           }),
-          dataCubeMetadata: metadata,
           dataCubesComponents: {
             dimensions,
             measures,
@@ -418,7 +387,7 @@ export const TableSortingOptions = ({
         },
       });
     },
-    [chartConfig, dimensions, dispatch, measures, metadata]
+    [chartConfig, dimensions, dispatch, measures]
   );
 
   if (!activeField || chartConfig.chartType !== "table") {
@@ -465,7 +434,6 @@ export const TableSortingOptions = ({
                               <TableSortingOptionItem
                                 {...option}
                                 index={i}
-                                metadata={metadata}
                                 dimensions={dimensions}
                                 measures={measures}
                                 chartConfig={chartConfig}
@@ -502,7 +470,6 @@ export const TableSortingOptions = ({
                   }}
                 >
                   <AddTableSortingOption
-                    metadata={metadata}
                     dimensions={dimensions}
                     measures={measures}
                     chartConfig={chartConfig}
diff --git a/app/domain/data.ts b/app/domain/data.ts
index b3f3d78c6..6ace9a128 100644
--- a/app/domain/data.ts
+++ b/app/domain/data.ts
@@ -2,7 +2,9 @@ import { Literal, NamedNode, Term } from "rdf-js";
 
 import { ComponentType } from "@/config-types";
 import {
+  DataCubeOrganization,
   DataCubePublicationStatus,
+  DataCubeTheme,
   RelatedDimension,
   ScaleType,
   TimeUnit,
@@ -45,6 +47,28 @@ export type DataCubesComponents = {
   measures: Measure[];
 };
 
+export type DataCubeMetadata = {
+  iri: string;
+  identifier?: string;
+  title: string;
+  description: string;
+  version?: string;
+  datePublished?: string;
+  dateModified?: string;
+  publicationStatus: DataCubePublicationStatus;
+  themes?: DataCubeTheme[];
+  creator?: DataCubeOrganization;
+  versionHistory?: string;
+  contactPoint?: {
+    name?: string;
+    email?: string;
+  };
+  publisher?: string;
+  landingPage?: string;
+  expires?: string;
+  workExamples?: string[];
+};
+
 export type Component = Dimension | Measure;
 
 type BasicComponent = {
diff --git a/app/graphql/queries/data-cubes.graphql b/app/graphql/queries/data-cubes.graphql
index 0cc6a3ab1..e3319bb83 100644
--- a/app/graphql/queries/data-cubes.graphql
+++ b/app/graphql/queries/data-cubes.graphql
@@ -50,43 +50,18 @@ query DataCubePreview(
   }
 }
 
-query DataCubeMetadata(
-  $iri: String!
+query DataCubesMetadata(
   $sourceType: String!
   $sourceUrl: String!
   $locale: String!
-  $latest: Boolean
+  $filters: [DataCubeFilter!]!
 ) {
-  dataCubeByIri(
-    iri: $iri
+  dataCubesMetadata(
     sourceType: $sourceType
     sourceUrl: $sourceUrl
     locale: $locale
-    latest: $latest
-  ) {
-    iri
-    identifier
-    title
-    description
-    publisher
-    version
-    workExamples
-    contactName
-    contactEmail
-    landingPage
-    expires
-    datePublished
-    dateModified
-    publicationStatus
-    themes {
-      iri
-      label
-    }
-    creator {
-      iri
-      label
-    }
-  }
+    filters: $filters
+  )
 }
 
 query DataCubesComponents(
diff --git a/app/graphql/query-hooks.ts b/app/graphql/query-hooks.ts
index 850a4a6c0..6be024a68 100644
--- a/app/graphql/query-hooks.ts
+++ b/app/graphql/query-hooks.ts
@@ -1,3 +1,4 @@
+import { DataCubeMetadata } from '../domain/data';
 import { DataCubesComponents } from '../domain/data';
 import { DimensionValue } from '../domain/data';
 import { QueryFilters } from '../configurator';
@@ -19,6 +20,7 @@ export type Scalars = {
   Boolean: boolean;
   Int: number;
   Float: number;
+  DataCubeMetadata: DataCubeMetadata;
   DataCubesComponents: DataCubesComponents;
   DimensionValue: DimensionValue;
   FilterValue: any;
@@ -95,6 +97,7 @@ export type DataCubeFilter = {
   latest?: Maybe<Scalars['Boolean']>;
 };
 
+
 export type DataCubeOrganization = {
   __typename: 'DataCubeOrganization';
   iri: Scalars['String'];
@@ -366,6 +369,7 @@ export type OrdinalMeasureHierarchyArgs = {
 export type Query = {
   __typename: 'Query';
   dataCubesComponents: Scalars['DataCubesComponents'];
+  dataCubesMetadata: Array<Scalars['DataCubeMetadata']>;
   dataCubeByIri?: Maybe<DataCube>;
   possibleFilters: Array<ObservationFilter>;
   searchCubes: Array<SearchCubeResult>;
@@ -380,6 +384,14 @@ export type QueryDataCubesComponentsArgs = {
 };
 
 
+export type QueryDataCubesMetadataArgs = {
+  sourceType: Scalars['String'];
+  sourceUrl: Scalars['String'];
+  locale: Scalars['String'];
+  filters: Array<DataCubeFilter>;
+};
+
+
 export type QueryDataCubeByIriArgs = {
   sourceType: Scalars['String'];
   sourceUrl: Scalars['String'];
@@ -574,16 +586,15 @@ export type DataCubePreviewQueryVariables = Exact<{
 
 export type DataCubePreviewQuery = { __typename: 'Query', dataCubeByIri?: Maybe<{ __typename: 'DataCube', iri: string, title: string, description?: Maybe<string>, publicationStatus: DataCubePublicationStatus, observations: { __typename: 'ObservationsQuery', data: Array<Observation>, sparql: string, sparqlEditorUrl?: Maybe<string> } }> };
 
-export type DataCubeMetadataQueryVariables = Exact<{
-  iri: Scalars['String'];
+export type DataCubesMetadataQueryVariables = Exact<{
   sourceType: Scalars['String'];
   sourceUrl: Scalars['String'];
   locale: Scalars['String'];
-  latest?: Maybe<Scalars['Boolean']>;
+  filters: Array<DataCubeFilter> | DataCubeFilter;
 }>;
 
 
-export type DataCubeMetadataQuery = { __typename: 'Query', dataCubeByIri?: Maybe<{ __typename: 'DataCube', iri: string, identifier?: Maybe<string>, title: string, description?: Maybe<string>, publisher?: Maybe<string>, version?: Maybe<string>, workExamples?: Maybe<Array<Maybe<string>>>, contactName?: Maybe<string>, contactEmail?: Maybe<string>, landingPage?: Maybe<string>, expires?: Maybe<string>, datePublished?: Maybe<string>, dateModified?: Maybe<string>, publicationStatus: DataCubePublicationStatus, themes: Array<{ __typename: 'DataCubeTheme', iri: string, label?: Maybe<string> }>, creator?: Maybe<{ __typename: 'DataCubeOrganization', iri: string, label?: Maybe<string> }> }> };
+export type DataCubesMetadataQuery = { __typename: 'Query', dataCubesMetadata: Array<DataCubeMetadata> };
 
 export type DataCubesComponentsQueryVariables = Exact<{
   sourceType: Scalars['String'];
@@ -691,43 +702,19 @@ export const DataCubePreviewDocument = gql`
 export function useDataCubePreviewQuery(options: Omit<Urql.UseQueryArgs<DataCubePreviewQueryVariables>, 'query'> = {}) {
   return Urql.useQuery<DataCubePreviewQuery>({ query: DataCubePreviewDocument, ...options });
 };
-export const DataCubeMetadataDocument = gql`
-    query DataCubeMetadata($iri: String!, $sourceType: String!, $sourceUrl: String!, $locale: String!, $latest: Boolean) {
-  dataCubeByIri(
-    iri: $iri
+export const DataCubesMetadataDocument = gql`
+    query DataCubesMetadata($sourceType: String!, $sourceUrl: String!, $locale: String!, $filters: [DataCubeFilter!]!) {
+  dataCubesMetadata(
     sourceType: $sourceType
     sourceUrl: $sourceUrl
     locale: $locale
-    latest: $latest
-  ) {
-    iri
-    identifier
-    title
-    description
-    publisher
-    version
-    workExamples
-    contactName
-    contactEmail
-    landingPage
-    expires
-    datePublished
-    dateModified
-    publicationStatus
-    themes {
-      iri
-      label
-    }
-    creator {
-      iri
-      label
-    }
-  }
+    filters: $filters
+  )
 }
     `;
 
-export function useDataCubeMetadataQuery(options: Omit<Urql.UseQueryArgs<DataCubeMetadataQueryVariables>, 'query'> = {}) {
-  return Urql.useQuery<DataCubeMetadataQuery>({ query: DataCubeMetadataDocument, ...options });
+export function useDataCubesMetadataQuery(options: Omit<Urql.UseQueryArgs<DataCubesMetadataQueryVariables>, 'query'> = {}) {
+  return Urql.useQuery<DataCubesMetadataQuery>({ query: DataCubesMetadataDocument, ...options });
 };
 export const DataCubesComponentsDocument = gql`
     query DataCubesComponents($sourceType: String!, $sourceUrl: String!, $locale: String!, $filters: [DataCubeFilter!]!) {
diff --git a/app/graphql/resolver-types.ts b/app/graphql/resolver-types.ts
index b1c197760..ae8c1c916 100644
--- a/app/graphql/resolver-types.ts
+++ b/app/graphql/resolver-types.ts
@@ -1,3 +1,4 @@
+import { DataCubeMetadata } from '../domain/data';
 import { DataCubesComponents } from '../domain/data';
 import { DimensionValue } from '../domain/data';
 import { Filters } from '../configurator';
@@ -20,6 +21,7 @@ export type Scalars = {
   Boolean: boolean;
   Int: number;
   Float: number;
+  DataCubeMetadata: DataCubeMetadata;
   DataCubesComponents: DataCubesComponents;
   DimensionValue: DimensionValue;
   FilterValue: any;
@@ -96,6 +98,7 @@ export type DataCubeFilter = {
   latest?: Maybe<Scalars['Boolean']>;
 };
 
+
 export type DataCubeOrganization = {
   __typename?: 'DataCubeOrganization';
   iri: Scalars['String'];
@@ -367,6 +370,7 @@ export type OrdinalMeasureHierarchyArgs = {
 export type Query = {
   __typename?: 'Query';
   dataCubesComponents: Scalars['DataCubesComponents'];
+  dataCubesMetadata: Array<Scalars['DataCubeMetadata']>;
   dataCubeByIri?: Maybe<DataCube>;
   possibleFilters: Array<ObservationFilter>;
   searchCubes: Array<SearchCubeResult>;
@@ -381,6 +385,14 @@ export type QueryDataCubesComponentsArgs = {
 };
 
 
+export type QueryDataCubesMetadataArgs = {
+  sourceType: Scalars['String'];
+  sourceUrl: Scalars['String'];
+  locale: Scalars['String'];
+  filters: Array<DataCubeFilter>;
+};
+
+
 export type QueryDataCubeByIriArgs = {
   sourceType: Scalars['String'];
   sourceUrl: Scalars['String'];
@@ -621,6 +633,7 @@ export type ResolversTypes = ResolversObject<{
   Int: ResolverTypeWrapper<Scalars['Int']>;
   Boolean: ResolverTypeWrapper<Scalars['Boolean']>;
   DataCubeFilter: DataCubeFilter;
+  DataCubeMetadata: ResolverTypeWrapper<Scalars['DataCubeMetadata']>;
   DataCubeOrganization: ResolverTypeWrapper<DataCubeOrganization>;
   DataCubePublicationStatus: DataCubePublicationStatus;
   DataCubeTheme: ResolverTypeWrapper<DataCubeTheme>;
@@ -666,6 +679,7 @@ export type ResolversParentTypes = ResolversObject<{
   Int: Scalars['Int'];
   Boolean: Scalars['Boolean'];
   DataCubeFilter: DataCubeFilter;
+  DataCubeMetadata: Scalars['DataCubeMetadata'];
   DataCubeOrganization: DataCubeOrganization;
   DataCubeTheme: DataCubeTheme;
   DataCubesComponents: Scalars['DataCubesComponents'];
@@ -724,6 +738,10 @@ export type DataCubeResolvers<ContextType = VisualizeGraphQLContext, ParentType
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
 
+export interface DataCubeMetadataScalarConfig extends GraphQLScalarTypeConfig<ResolversTypes['DataCubeMetadata'], any> {
+  name: 'DataCubeMetadata';
+}
+
 export type DataCubeOrganizationResolvers<ContextType = VisualizeGraphQLContext, ParentType extends ResolversParentTypes['DataCubeOrganization'] = ResolversParentTypes['DataCubeOrganization']> = ResolversObject<{
   iri?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   label?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
@@ -911,6 +929,7 @@ export type OrdinalMeasureResolvers<ContextType = VisualizeGraphQLContext, Paren
 
 export type QueryResolvers<ContextType = VisualizeGraphQLContext, ParentType extends ResolversParentTypes['Query'] = ResolversParentTypes['Query']> = ResolversObject<{
   dataCubesComponents?: Resolver<ResolversTypes['DataCubesComponents'], ParentType, ContextType, RequireFields<QueryDataCubesComponentsArgs, 'sourceType' | 'sourceUrl' | 'locale' | 'filters'>>;
+  dataCubesMetadata?: Resolver<Array<ResolversTypes['DataCubeMetadata']>, ParentType, ContextType, RequireFields<QueryDataCubesMetadataArgs, 'sourceType' | 'sourceUrl' | 'locale' | 'filters'>>;
   dataCubeByIri?: Resolver<Maybe<ResolversTypes['DataCube']>, ParentType, ContextType, RequireFields<QueryDataCubeByIriArgs, 'sourceType' | 'sourceUrl' | 'iri' | 'latest'>>;
   possibleFilters?: Resolver<Array<ResolversTypes['ObservationFilter']>, ParentType, ContextType, RequireFields<QueryPossibleFiltersArgs, 'iri' | 'sourceType' | 'sourceUrl' | 'filters'>>;
   searchCubes?: Resolver<Array<ResolversTypes['SearchCubeResult']>, ParentType, ContextType, RequireFields<QuerySearchCubesArgs, 'sourceType' | 'sourceUrl'>>;
@@ -998,6 +1017,7 @@ export interface ValuePositionScalarConfig extends GraphQLScalarTypeConfig<Resol
 
 export type Resolvers<ContextType = VisualizeGraphQLContext> = ResolversObject<{
   DataCube?: DataCubeResolvers<ContextType>;
+  DataCubeMetadata?: GraphQLScalarType;
   DataCubeOrganization?: DataCubeOrganizationResolvers<ContextType>;
   DataCubeTheme?: DataCubeThemeResolvers<ContextType>;
   DataCubesComponents?: GraphQLScalarType;
diff --git a/app/graphql/resolvers/index.ts b/app/graphql/resolvers/index.ts
index c651a481f..53515d5e7 100644
--- a/app/graphql/resolvers/index.ts
+++ b/app/graphql/resolvers/index.ts
@@ -29,6 +29,10 @@ export const Query: QueryResolvers = {
     const source = getSource(args.sourceType);
     return await source.dataCubesComponents(parent, args, context, info);
   },
+  dataCubesMetadata: async (parent, args, context, info) => {
+    const source = getSource(args.sourceType);
+    return await source.dataCubesMetadata(parent, args, context, info);
+  },
   dataCubeByIri: async (parent, args, context, info) => {
     const source = getSource(args.sourceType);
     return await source.dataCubeByIri(parent, args, context, info);
diff --git a/app/graphql/resolvers/rdf.ts b/app/graphql/resolvers/rdf.ts
index 257f36da4..09ba6cf21 100644
--- a/app/graphql/resolvers/rdf.ts
+++ b/app/graphql/resolvers/rdf.ts
@@ -30,6 +30,7 @@ import {
   getCubesDimensions,
   getLatestCube,
 } from "@/rdf/queries";
+import { getCubeMetadata } from "@/rdf/query-cube-metadata";
 import { unversionObservation } from "@/rdf/query-dimension-values";
 import { queryHierarchy } from "@/rdf/query-hierarchies";
 import { SearchResult, searchCubes as _searchCubes } from "@/rdf/query-search";
@@ -289,6 +290,30 @@ export const dataCubesComponents: NonNullable<
   return { dimensions, measures };
 };
 
+export const dataCubesMetadata: NonNullable<
+  QueryResolvers["dataCubesMetadata"]
+> = async (_, { locale, filters }, { setup }, info) => {
+  const { loaders, sparqlClient } = await setup(info);
+
+  return await Promise.all(
+    filters.map(async (filter) => {
+      const { iri, latest = true } = filter;
+      const rawCube = await loaders.cube.load(iri);
+
+      if (!rawCube) {
+        throw new Error("Cube not found!");
+      }
+
+      const cube = latest ? await getLatestCube(rawCube) : rawCube;
+
+      return await getCubeMetadata(cube.term?.value!, {
+        locale,
+        sparqlClient,
+      });
+    })
+  );
+};
+
 export const dataCubeDimensions: NonNullable<DataCubeResolvers["dimensions"]> =
   async ({ cube, locale }, { componentIris }, { setup }, info) => {
     const { sparqlClient, cache } = await setup(info);
diff --git a/app/graphql/resolvers/sql.ts b/app/graphql/resolvers/sql.ts
index 795f4d7eb..fb0f17d4e 100644
--- a/app/graphql/resolvers/sql.ts
+++ b/app/graphql/resolvers/sql.ts
@@ -129,6 +129,12 @@ export const dataCubesComponents: NonNullable<
   return { dimensions: [], measures: [] };
 };
 
+export const dataCubesMetadata: NonNullable<
+  QueryResolvers["dataCubesMetadata"]
+> = async () => {
+  return [];
+};
+
 export const dataCubeByIri: NonNullable<QueryResolvers["dataCubeByIri"]> =
   async (_, { iri }) => {
     const result = await fetchSQL({ path: `cubes/${iri}` });
diff --git a/app/graphql/schema.graphql b/app/graphql/schema.graphql
index 035b6a2c6..c11171f88 100644
--- a/app/graphql/schema.graphql
+++ b/app/graphql/schema.graphql
@@ -351,6 +351,7 @@ input DataCubeFilter {
 }
 
 scalar DataCubesComponents
+scalar DataCubeMetadata
 
 # The "Query" type is special: it lists all of the available queries that
 # clients can execute, along with the return type for each.
@@ -361,6 +362,12 @@ type Query {
     locale: String!
     filters: [DataCubeFilter!]!
   ): DataCubesComponents!
+  dataCubesMetadata(
+    sourceType: String!
+    sourceUrl: String!
+    locale: String!
+    filters: [DataCubeFilter!]!
+  ): [DataCubeMetadata!]!
   dataCubeByIri(
     sourceType: String!
     sourceUrl: String!
diff --git a/app/graphql/shared-types.ts b/app/graphql/shared-types.ts
index 79d892e82..e282fd106 100644
--- a/app/graphql/shared-types.ts
+++ b/app/graphql/shared-types.ts
@@ -3,44 +3,17 @@ import { Literal, NamedNode } from "rdf-js";
 
 import { ExtendedCube } from "@/rdf/extended-cube";
 
-import { Observation } from "../domain/data";
+import { DataCubeMetadata, Observation } from "../domain/data";
 
 import { RelatedDimension } from "./query-hooks";
-import {
-  DataCubeOrganization,
-  DataCubePublicationStatus,
-  DataCubeTheme,
-  ScaleType,
-  TimeUnit,
-} from "./resolver-types";
+import { ScaleType, TimeUnit } from "./resolver-types";
 
 /** Types shared by graphql-codegen and resolver code */
 
 export type ResolvedDataCube = {
   cube: ExtendedCube;
   locale: string;
-  data: {
-    iri: string;
-    identifier: string;
-    title: string;
-    description: string;
-    version?: string;
-    datePublished?: string;
-    dateModified?: string;
-    publicationStatus: DataCubePublicationStatus;
-    themes?: DataCubeTheme[];
-    creator?: DataCubeOrganization;
-    versionHistory?: string;
-    contactPoint?: {
-      name?: string;
-      email?: string;
-    };
-    publisher?: string;
-    landingPage?: string;
-    expires?: string;
-    keywords?: string[];
-    workExamples?: string[];
-  };
+  data: DataCubeMetadata;
 };
 
 export type ResolvedDimension = {
diff --git a/app/login/components/profile-tables.tsx b/app/login/components/profile-tables.tsx
index 315b43066..3b3080453 100644
--- a/app/login/components/profile-tables.tsx
+++ b/app/login/components/profile-tables.tsx
@@ -27,7 +27,7 @@ import useDisclosure from "@/components/use-disclosure";
 import { ParsedConfig } from "@/db/config";
 import { sourceToLabel } from "@/domain/datasource";
 import { truthy } from "@/domain/types";
-import { useDataCubeMetadataQuery } from "@/graphql/query-hooks";
+import { useDataCubesMetadataQuery } from "@/graphql/query-hooks";
 import { Icon, IconName } from "@/icons";
 import { useRootStyles } from "@/login/utils";
 import { useLocale } from "@/src";
@@ -172,14 +172,14 @@ const ProfileVisualizationsRow = (props: ProfileVisualizationsRowProps) => {
   );
   const dataSet = dataSets.length === 1 ? dataSets[0] : null;
   const locale = useLocale();
-  const [{ data, fetching }] = useDataCubeMetadataQuery(
+  const [{ data, fetching }] = useDataCubesMetadataQuery(
     dataSet
       ? {
           variables: {
-            iri: dataSet,
             sourceType: dataSource.type,
             sourceUrl: dataSource.url,
             locale,
+            filters: [{ iri: dataSet }],
           },
         }
       : {
@@ -280,7 +280,7 @@ const ProfileVisualizationsRow = (props: ProfileVisualizationsRowProps) => {
           >
             <Link target="_blank" color="primary">
               <Typography variant="body2" noWrap>
-                {data?.dataCubeByIri?.title ?? ""}
+                {data?.dataCubesMetadata[0]?.title ?? ""}
               </Typography>
             </Link>
           </NextLink>
diff --git a/app/rdf/parse.ts b/app/rdf/parse.ts
index daf605029..96d67c56d 100644
--- a/app/rdf/parse.ts
+++ b/app/rdf/parse.ts
@@ -90,7 +90,6 @@ export const parseCube = ({
       publisher: cube.out(ns.dcterms.publisher)?.value,
       landingPage: cube.out(ns.dcat.landingPage)?.value,
       expires: cube.out(ns.schema.expires)?.value,
-      keywords: cube.out(ns.dcat.keyword)?.values,
       workExamples: cube.out(ns.schema.workExample)?.values,
     },
   };
diff --git a/app/rdf/query-cube-metadata.ts b/app/rdf/query-cube-metadata.ts
index 3a8a75dda..e275cabdc 100644
--- a/app/rdf/query-cube-metadata.ts
+++ b/app/rdf/query-cube-metadata.ts
@@ -1,14 +1,171 @@
 import RDF from "@rdfjs/data-model";
-import { SELECT, sparql } from "@tpluscode/sparql-builder";
+import { SELECT } from "@tpluscode/sparql-builder";
 import keyBy from "lodash/keyBy";
+import { Literal, NamedNode } from "rdf-js";
 import { ParsingClient } from "sparql-http-client/ParsingClient";
 
-import { schema, dcat, dcterms, cube } from "../../app/rdf/namespace";
-import { DataCubeOrganization, DataCubeTheme } from "../graphql/query-hooks";
+import { DataCubeMetadata } from "@/domain/data";
+import * as ns from "@/rdf/namespace";
+
+import { cube, schema } from "../../app/rdf/namespace";
+import {
+  DataCubeOrganization,
+  DataCubePublicationStatus,
+  DataCubeTheme,
+} from "../graphql/query-hooks";
 
 import { pragmas } from "./create-source";
 import { makeLocalesFilter } from "./query-labels";
-import { makeVisualizeDatasetFilter } from "./query-utils";
+import {
+  GROUP_SEPARATOR,
+  buildLocalizedSubQuery,
+  makeVisualizeDatasetFilter,
+} from "./query-utils";
+
+type RawDataCubeMetadata = {
+  iri: NamedNode;
+  identifier: NamedNode;
+  title: Literal;
+  description: Literal;
+  version: Literal;
+  datePublished: Literal;
+  dateModified: Literal;
+  status: NamedNode;
+  themeIris: NamedNode;
+  themeLabels: Literal;
+  creatorIri: NamedNode;
+  creatorLabel: Literal;
+  versionHistory: NamedNode;
+  contactPointEmail: Literal;
+  contactPointName: Literal;
+  publisher: NamedNode;
+  landingPage: NamedNode;
+  expires: Literal;
+  workExamples: NamedNode;
+};
+
+const parseRawMetadata = (cube: RawDataCubeMetadata): DataCubeMetadata => {
+  const themeIris = cube.themeIris.value.split(GROUP_SEPARATOR);
+  const themeLabels = cube.themeLabels.value.split(GROUP_SEPARATOR);
+
+  return {
+    iri: cube.iri.value,
+    identifier: cube.identifier?.value,
+    title: cube.title.value,
+    description: cube.description?.value,
+    version: cube.version?.value,
+    datePublished: cube.datePublished?.value,
+    dateModified: cube.dateModified?.value,
+    publicationStatus:
+      cube.status.value ===
+      ns.adminVocabulary("CreativeWorkStatus/Published").value
+        ? DataCubePublicationStatus.Published
+        : DataCubePublicationStatus.Draft,
+    themes:
+      themeIris.length === themeLabels.length
+        ? themeIris.map((iri, i) => ({
+            iri,
+            label: themeLabels[i],
+          }))
+        : [],
+    creator:
+      cube.creatorIri && cube.creatorLabel
+        ? { iri: cube.creatorIri.value, label: cube.creatorLabel.value }
+        : undefined,
+    versionHistory: cube.versionHistory?.value,
+    contactPoint: {
+      email: cube.contactPointEmail?.value,
+      name: cube.contactPointName?.value,
+    },
+    publisher: cube.publisher?.value,
+    landingPage: cube.landingPage?.value,
+    expires: cube.expires?.value,
+    workExamples: cube.workExamples?.value.split(GROUP_SEPARATOR),
+  };
+};
+
+export const getCubeMetadata = async (
+  iri: string,
+  { locale, sparqlClient }: { locale: string; sparqlClient: ParsingClient }
+): Promise<DataCubeMetadata> => {
+  const query = SELECT`
+    ?iri ?identifier ?title ?description ?version ?datePublished ?dateModified ?status ?creatorIri ?creatorLabel ?versionHistory ?contactPointName ?contactPointEmail ?publisher ?landingPage ?expires
+    (GROUP_CONCAT(DISTINCT ?themeIri; SEPARATOR="${GROUP_SEPARATOR}") AS ?themeIris) (GROUP_CONCAT(DISTINCT ?themeLabel; SEPARATOR="${GROUP_SEPARATOR}") AS ?themeLabels)
+    (GROUP_CONCAT(DISTINCT ?subthemeIri; SEPARATOR="${GROUP_SEPARATOR}") AS ?subthemeIris) (GROUP_CONCAT(DISTINCT ?subthemeLabel; SEPARATOR="${GROUP_SEPARATOR}") AS ?subthemeLabels)
+    (GROUP_CONCAT(DISTINCT ?workExample; SEPARATOR="${GROUP_SEPARATOR}") AS ?workExamples)
+    `.WHERE`
+    VALUES ?iri { <${iri}> }
+    OPTIONAL { ?iri ${ns.dcterms.identifier} ?identifier . }
+    ${buildLocalizedSubQuery("iri", "schema:name", "title", {
+      locale,
+    })}
+    ${buildLocalizedSubQuery("iri", "schema:description", "description", {
+      locale,
+    })}
+    OPTIONAL { ?iri ${ns.schema.version} ?version . }
+    OPTIONAL { ?iri ${ns.schema.datePublished} ?datePublished . }
+    OPTIONAL { ?iri ${ns.schema.dateModified} ?dateModified . }
+    ?iri ${ns.schema.creativeWorkStatus} ?status .
+    OPTIONAL {
+      ?iri ${ns.dcterms.creator} ?creatorIri .
+      GRAPH <https://lindas.admin.ch/sfa/opendataswiss> {
+        ?creatorIri a ${ns.schema.Organization} ;
+          ${
+            ns.schema.inDefinedTermSet
+          } <https://register.ld.admin.ch/opendataswiss/org> .
+          ${buildLocalizedSubQuery(
+            "creatorIri",
+            "schema:name",
+            "creatorLabel",
+            { locale }
+          )}
+      }
+    }
+    OPTIONAL {
+      ?iri ${ns.dcat.theme} ?themeIri .
+      GRAPH <https://lindas.admin.ch/sfa/opendataswiss> {
+        ?themeIri a ${ns.schema.DefinedTerm} ;
+        ${
+          ns.schema.inDefinedTermSet
+        } <https://register.ld.admin.ch/opendataswiss/category> .
+        ${buildLocalizedSubQuery("themeIri", "schema:name", "themeLabel", {
+          locale,
+        })}
+      }
+    }
+    OPTIONAL { ?versionHistory ${ns.schema.hasPart} ?iri . }
+    OPTIONAL {
+      ?iri ${ns.dcat.contactPoint} ?contactPoint .
+      ?contactPoint ${ns.vcard.fn} ?contactPointName .
+      ?contactPoint ${ns.vcard.hasEmail} ?contactPointEmail .
+    }
+    OPTIONAL { ?iri ${ns.dcterms.publisher} ?publisher . }
+    OPTIONAL { ?iri ${ns.dcat.landingPage} ?landingPage . }
+    OPTIONAL { ?iri ${ns.schema.expires} ?expires . }
+    OPTIONAL { ?iri ${ns.schema.workExample} ?workExample . }
+  `.GROUP().BY`?iri`.THEN.BY`?identifier`.THEN.BY`?title`.THEN.BY`?description`
+    .THEN.BY`?version`.THEN.BY`?datePublished`.THEN.BY`?dateModified`.THEN
+    .BY`?status`.THEN.BY`?creatorIri`.THEN.BY`?creatorLabel`.THEN
+    .BY`?versionHistory`.THEN.BY`?contactPointName`.THEN.BY`?contactPointEmail`
+    .THEN.BY`?publisher`.THEN.BY`?landingPage`.THEN.BY`?expires`
+    .prologue`${pragmas}`;
+
+  const results = (await query.execute(sparqlClient.query, {
+    operation: "postUrlencoded",
+  })) as RawDataCubeMetadata[];
+
+  if (results.length === 0) {
+    throw new Error(`No cube found for ${iri}!`);
+  }
+
+  if (results.length > 1) {
+    throw new Error(`Multiple cubes found for ${iri}!`);
+  }
+
+  const result = results[0];
+
+  return parseRawMetadata(result);
+};
 
 type RawDataCubeTheme = Omit<DataCubeTheme, "__typename">;
 type RawDataCubeOrganization = Omit<DataCubeOrganization, "__typename">;
@@ -54,8 +211,7 @@ export const createThemeLoader =
       });
     }
 
-    const parsed = results.map(parseSparqlTheme);
-    return parsed;
+    return results.map(parseSparqlTheme);
   };
 
 export const createOrganizationLoader =
@@ -80,119 +236,9 @@ export const createOrganizationLoader =
       });
     }
 
-    const parsed = results.map(parseSparqlOrganization);
-    return parsed;
+    return results.map(parseSparqlOrganization);
   };
 
-export const loadThemes = ({
-  locale,
-  sparqlClient,
-}: {
-  locale: string;
-  sparqlClient: ParsingClient;
-}) => {
-  return createThemeLoader({ locale, sparqlClient })();
-};
-
-export const loadOrganizations = ({
-  locale,
-  sparqlClient,
-}: {
-  locale: string;
-  sparqlClient: ParsingClient;
-}) => {
-  return createOrganizationLoader({ locale, sparqlClient })();
-};
-
-export const queryDatasetCountByOrganization = async ({
-  sparqlClient,
-  theme,
-  includeDrafts,
-}: {
-  sparqlClient: ParsingClient;
-  theme?: string;
-  includeDrafts?: boolean;
-}) => {
-  const query = SELECT`(count(?iri) as ?count) ?creator`.WHERE`
-    ?iri ${dcterms.creator} ?creator.
-    ${theme ? sparql`?iri ${dcat.theme} <${theme}>.` : ``}
-    ${makeVisualizeDatasetFilter({ includeDrafts })}
-  `.GROUP().BY`?creator`.build();
-  const results = await sparqlClient.query.select(query, {
-    operation: "postUrlencoded",
-  });
-  return results
-    .map((r) => {
-      return {
-        count: parseInt(r.count.value, 10),
-        iri: r.creator?.value,
-      };
-    })
-    .filter((r) => r.iri);
-};
-
-export const queryDatasetCountByTheme = async ({
-  sparqlClient,
-  organization,
-  includeDrafts,
-}: {
-  sparqlClient: ParsingClient;
-  organization?: string;
-  includeDrafts?: boolean;
-}) => {
-  const query = SELECT`(count(?iri) as ?count) ?theme`.WHERE`
-    ?iri ${dcat.theme} ?theme.
-    ${organization ? sparql`?iri ${dcterms.creator} <${organization}>.` : ``}
-    ?theme ${
-      schema.inDefinedTermSet
-    } <https://register.ld.admin.ch/opendataswiss/category>.
-    ${makeVisualizeDatasetFilter({ includeDrafts })}
-  `.GROUP().BY`?theme`.build();
-  const results = await sparqlClient.query.select(query, {
-    operation: "postUrlencoded",
-  });
-  return results
-    .map((r) => {
-      return {
-        count: parseInt(r.count.value, 10),
-        iri: r.theme?.value,
-      };
-    })
-    .filter((r) => r.iri);
-};
-
-export const queryDatasetCountBySubTheme = async ({
-  sparqlClient,
-  organization,
-  theme,
-  includeDrafts,
-}: {
-  sparqlClient: ParsingClient;
-  organization?: string;
-  theme?: string;
-  includeDrafts?: boolean;
-}) => {
-  const baseQuery = SELECT`(count(?iri) as ?count) ?subtheme`.WHERE`
-    ?iri ${schema.about} ?subtheme.
-    ${organization ? sparql`?iri ${dcterms.creator} <${organization}>.` : ``}
-    ${theme ? sparql`?iri ${dcat.theme} <${theme}>.` : ``}
-    ?iri ${schema.about} ?subtheme. 
-    ${makeVisualizeDatasetFilter({ includeDrafts })}
-  `.build();
-  const query = `${baseQuery} GROUP BY ?subtheme`;
-  const results = await sparqlClient.query.select(query, {
-    operation: "postUrlencoded",
-  });
-  return results
-    .map((r) => {
-      return {
-        count: parseInt(r.count.value, 10),
-        iri: r.subtheme?.value,
-      };
-    })
-    .filter((r) => r.iri);
-};
-
 export const queryLatestPublishedCubeFromUnversionedIri = async (
   sparqlClient: ParsingClient,
   unversionedIri: string
@@ -228,27 +274,3 @@ export const queryLatestPublishedCubeFromUnversionedIri = async (
     iri: results[0].iri.value,
   };
 };
-
-export const loadSubthemes = async ({
-  sparqlClient,
-  parentIri,
-  locale,
-}: {
-  sparqlClient: ParsingClient;
-  parentIri: string;
-  locale: string;
-}) => {
-  const query = SELECT`?iri ?label`.WHERE`
-    ?iri ${schema.inDefinedTermSet} <${parentIri}>;
-    ${makeLocalesFilter("?iri", schema.name, "?label", locale)}
-  `.build();
-  const results = await sparqlClient.query.select(query, {
-    operation: "postUrlencoded",
-  });
-  return results.map((r) => {
-    return {
-      iri: r.iri.value,
-      label: r.label.value,
-    };
-  });
-};
diff --git a/app/rdf/query-search.ts b/app/rdf/query-search.ts
index c67cc5e61..afd8dabda 100644
--- a/app/rdf/query-search.ts
+++ b/app/rdf/query-search.ts
@@ -9,12 +9,16 @@ import {
   DataCubePublicationStatus,
   SearchCubeFilter,
 } from "@/graphql/resolver-types";
-import { defaultLocale, locales } from "@/locales/locales";
+import { defaultLocale } from "@/locales/locales";
 import * as ns from "@/rdf/namespace";
 
 import { pragmas } from "./create-source";
 import { computeScores, highlight } from "./query-search-score-utils";
-import { makeVisualizeDatasetFilter } from "./query-utils";
+import {
+  GROUP_SEPARATOR,
+  buildLocalizedSubQuery,
+  makeVisualizeDatasetFilter,
+} from "./query-utils";
 
 // Keep in sync with the query.
 type RawSearchCube = {
@@ -57,34 +61,6 @@ const parseRawSearchCube = (cube: RawSearchCube): ParsedRawSearchCube => {
   };
 };
 
-const getOrderedLocales = (locale: string) => {
-  const rest = locales.filter((d) => d !== locale);
-  return [locale, ...rest];
-};
-
-const buildLocalizedSubQuery = (
-  s: string,
-  p: string,
-  o: string,
-  { locale }: { locale: string }
-) => {
-  // Include the empty locale as well.
-  const locales = getOrderedLocales(locale).concat("");
-
-  return `${locales
-    .map(
-      (locale) => `OPTIONAL {
-          ?${s} ${p} ?${o}_${locale} .
-          FILTER(LANG(?${o}_${locale}) = "${locale}")
-        }`
-    )
-    .join("\n")}
-      BIND(COALESCE(${locales
-        .map((locale) => `?${o}_${locale}`)
-        .join(", ")}) AS ?${o})
-  `;
-};
-
 const makeInFilter = (name: string, values: string[]) => {
   return `
     ${
@@ -96,8 +72,6 @@ const makeInFilter = (name: string, values: string[]) => {
     }`;
 };
 
-const GROUP_SEPARATOR = "|||";
-
 export const searchCubes = async ({
   query,
   locale: _locale,
diff --git a/app/rdf/query-utils.ts b/app/rdf/query-utils.ts
index f5a08e378..aa44a610e 100644
--- a/app/rdf/query-utils.ts
+++ b/app/rdf/query-utils.ts
@@ -1,7 +1,39 @@
 import { sparql } from "@tpluscode/sparql-builder";
 
+import { locales } from "@/locales/locales";
+
 import { cube, schema } from "../../app/rdf/namespace";
 
+export const GROUP_SEPARATOR = "|||";
+
+export const buildLocalizedSubQuery = (
+  s: string,
+  p: string,
+  o: string,
+  { locale }: { locale: string }
+) => {
+  // Include the empty locale as well.
+  const locales = getOrderedLocales(locale).concat("");
+
+  return `${locales
+    .map(
+      (locale) => `OPTIONAL {
+          ?${s} ${p} ?${o}_${locale} .
+          FILTER(LANG(?${o}_${locale}) = "${locale}")
+        }`
+    )
+    .join("\n")}
+      BIND(COALESCE(${locales
+        .map((locale) => `?${o}_${locale}`)
+        .join(", ")}) AS ?${o})
+  `;
+};
+
+const getOrderedLocales = (locale: string) => {
+  const rest = locales.filter((d) => d !== locale);
+  return [locale, ...rest];
+};
+
 export const makeVisualizeDatasetFilter = (options?: {
   includeDrafts?: boolean;
   cubeIriVar?: string;
diff --git a/app/scripts/cube.ts b/app/scripts/cube.ts
index 9a2f968fa..2b43d8edf 100644
--- a/app/scripts/cube.ts
+++ b/app/scripts/cube.ts
@@ -9,15 +9,15 @@ import { DataSource } from "@/configurator";
 
 import { GRAPHQL_ENDPOINT } from "../domain/env";
 import {
-  DataCubeMetadataDocument,
-  DataCubeMetadataQuery,
-  DataCubeMetadataQueryVariables,
   DataCubePreviewDocument,
   DataCubePreviewQuery,
   DataCubePreviewQueryVariables,
   DataCubesComponentsDocument,
   DataCubesComponentsQuery,
   DataCubesComponentsQueryVariables,
+  DataCubesMetadataDocument,
+  DataCubesMetadataQuery,
+  DataCubesMetadataQueryVariables,
 } from "../graphql/query-hooks";
 
 config();
@@ -44,14 +44,13 @@ const showCubeInfo = async ({
   report,
 }: Args<CubeQueryOptions>) => {
   const res = await client
-    .query<DataCubeMetadataQuery, DataCubeMetadataQueryVariables>(
-      DataCubeMetadataDocument,
+    .query<DataCubesMetadataQuery, DataCubesMetadataQueryVariables>(
+      DataCubesMetadataDocument,
       {
-        iri,
         sourceType,
         sourceUrl,
         locale,
-        latest,
+        filters: [{ iri, latest }],
       }
     )
     .toPromise();
@@ -60,7 +59,7 @@ const showCubeInfo = async ({
     throw new Error(res.error.message);
   }
 
-  const cube = res.data?.dataCubeByIri;
+  const cube = res.data?.dataCubesMetadata[0];
 
   if (cube?.iri !== iri) {
     console.warn(
@@ -108,14 +107,13 @@ const previewCube = async ({
   report,
 }: Args<CubeQueryOptions>) => {
   const { data: info, error } = await client
-    .query<DataCubeMetadataQuery, DataCubeMetadataQueryVariables>(
-      DataCubeMetadataDocument,
+    .query<DataCubesMetadataQuery, DataCubesMetadataQueryVariables>(
+      DataCubesMetadataDocument,
       {
-        iri,
         sourceType,
         sourceUrl,
         locale,
-        latest,
+        filters: [{ iri, latest }],
       }
     )
     .toPromise();
@@ -124,7 +122,7 @@ const previewCube = async ({
     throw new Error(error.message);
   }
 
-  if (!info || !info["dataCubeByIri"]) {
+  if (!info || !info.dataCubesMetadata[0]) {
     throw new Error(`Could not find datacube ${iri}`);
   }
 
diff --git a/app/utils/opendata.ts b/app/utils/opendata.ts
index 076324d26..3c2987ccd 100644
--- a/app/utils/opendata.ts
+++ b/app/utils/opendata.ts
@@ -1,9 +1,6 @@
-import { DataCubeMetadataQuery } from "@/graphql/query-hooks";
+import { DataCubeMetadata } from "@/domain/data";
 
-const makeOpenDataLink = (
-  lang: string,
-  cube: DataCubeMetadataQuery["dataCubeByIri"]
-) => {
+const makeOpenDataLink = (lang: string, cube: DataCubeMetadata) => {
   const identifier = cube?.identifier;
   const creatorIri = cube?.creator?.iri;
   const isPublished = cube?.workExamples?.includes(
diff --git a/codegen.yml b/codegen.yml
index 272d7be8d..90fc5e828 100644
--- a/codegen.yml
+++ b/codegen.yml
@@ -23,6 +23,7 @@ generates:
         GeoShape: "../domain/data#GeoShape"
         SearchCube: "../domain/data#SearchCube"
         DataCubesComponents: "../domain/data#DataCubesComponents"
+        DataCubeMetadata: "../domain/data#DataCubeMetadata"
   app/graphql/resolver-types.ts:
     plugins:
       - "typescript"
@@ -41,6 +42,7 @@ generates:
         GeoShape: "../domain/data#GeoShape"
         SearchCube: "../domain/data#SearchCube"
         DataCubesComponents: "../domain/data#DataCubesComponents"
+        DataCubeMetadata: "../domain/data#DataCubeMetadata"
       mappers:
         DataCube: "./shared-types#ResolvedDataCube"
         ObservationsQuery: "./shared-types#ResolvedObservationsQuery"