diff --git a/app/components/form.tsx b/app/components/form.tsx
index c47d400bf..496a53245 100644
--- a/app/components/form.tsx
+++ b/app/components/form.tsx
@@ -353,7 +353,7 @@ export const Select = ({
     <LoadingMenuPaperContext.Provider value={loading}>
       <Box sx={{ width: "100%", ...sx }}>
         {label && (
-          <Label htmlFor={id} smaller sx={{ my: 1 }}>
+          <Label htmlFor={id} smaller sx={{ my: "6px" }}>
             {label}
             {controls}
           </Label>
diff --git a/app/components/select-tree.tsx b/app/components/select-tree.tsx
index 270b577d6..c61f1094d 100644
--- a/app/components/select-tree.tsx
+++ b/app/components/select-tree.tsx
@@ -481,7 +481,7 @@ function SelectTree({
   return (
     <div>
       {label && (
-        <Label htmlFor={id!} smaller sx={{ my: 1 }}>
+        <Label htmlFor={id!} smaller sx={{ my: "6px" }}>
           {label} {controls}
         </Label>
       )}
diff --git a/app/configurator/components/field.tsx b/app/configurator/components/field.tsx
index bf5c41e99..682fd0fcb 100644
--- a/app/configurator/components/field.tsx
+++ b/app/configurator/components/field.tsx
@@ -80,6 +80,7 @@ import {
   HierarchyValue,
   ObservationValue,
   TemporalDimension,
+  isTemporalOrdinalDimension,
 } from "@/domain/data";
 import { useTimeFormatLocale } from "@/formatters";
 import { TimeUnit } from "@/graphql/query-hooks";
@@ -240,11 +241,56 @@ export const DataFilterSelect = ({
     );
   }
 
+  const canUseMostRecentValue = isTemporalOrdinalDimension(dimension);
+  const usesMostRecentValue = isDynamicMaxValue(fieldProps.value);
+  const maxValue = sortedValues[sortedValues.length - 1].value;
+
   return (
     <Select
       id={id}
-      label={<FieldLabel label={label} isOptional={isOptional} />}
-      disabled={disabled}
+      label={
+        canUseMostRecentValue ? (
+          <Flex
+            sx={{
+              width: "100%",
+              justifyContent: "space-between",
+              alignItems: "center",
+            }}
+          >
+            <FieldLabel label={label} isOptional={isOptional} />
+            <FormGroup>
+              <FormControlLabel
+                control={
+                  <MUISwitch
+                    size="small"
+                    checked={usesMostRecentValue}
+                    onChange={() =>
+                      fieldProps.onChange({
+                        target: {
+                          value: usesMostRecentValue
+                            ? `${maxValue}`
+                            : VISUALIZE_MAX_VALUE,
+                        },
+                      })
+                    }
+                  />
+                }
+                label={
+                  <Typography variant="caption">
+                    <Trans id="controls.filter.use-most-recent">
+                      Use most recent
+                    </Trans>
+                  </Typography>
+                }
+                sx={{ mr: 0 }}
+              />
+            </FormGroup>
+          </Flex>
+        ) : (
+          <FieldLabel label={label} isOptional={isOptional} />
+        )
+      }
+      disabled={disabled || usesMostRecentValue}
       options={allValues}
       sortOptions={false}
       controls={controls}
@@ -253,6 +299,7 @@ export const DataFilterSelect = ({
       onOpen={handleOpen}
       loading={loading}
       {...fieldProps}
+      value={usesMostRecentValue ? maxValue : fieldProps.value}
     />
   );
 };
@@ -349,11 +396,11 @@ export const DataFilterTemporal = (props: DataFilterTemporalProps) => {
               </OpenMetadataPanelWrapper>
             }
           />
-          {/* FIXME: adapt to design */}
           <FormGroup>
             <FormControlLabel
               control={
                 <MUISwitch
+                  size="small"
                   checked={usesMostRecentDate}
                   onChange={() =>
                     fieldProps.onChange({
@@ -366,8 +413,14 @@ export const DataFilterTemporal = (props: DataFilterTemporalProps) => {
                   }
                 />
               }
-              // FIXME: adapt to design, translate
-              label={<Typography variant="caption">Use most recent</Typography>}
+              label={
+                <Typography variant="caption">
+                  <Trans id="controls.filter.use-most-recent">
+                    Use most recent
+                  </Trans>
+                </Typography>
+              }
+              sx={{ mr: 0 }}
             />
           </FormGroup>
         </Flex>
diff --git a/app/locales/de/messages.po b/app/locales/de/messages.po
index d459118cb..507ff07aa 100644
--- a/app/locales/de/messages.po
+++ b/app/locales/de/messages.po
@@ -421,7 +421,6 @@ msgstr "Beschreibung hinzufügen"
 #: app/charts/shared/chart-data-filters.tsx
 #: app/configurator/components/field.tsx
 #: app/configurator/components/field.tsx
-#: app/configurator/components/field.tsx
 msgid "controls.dimensionvalue.none"
 msgstr "Kein Filter"
 
@@ -441,6 +440,10 @@ msgstr "Alle auswählen"
 msgid "controls.filter.select.none"
 msgstr "Alle abwählen"
 
+#: app/configurator/components/field.tsx
+msgid "controls.filter.use-most-recent"
+msgstr "Letztes Datum verwenden"
+
 #: app/configurator/components/chart-options-selector.tsx
 msgid "controls.filters.interactive.calculation"
 msgstr "Benutzer können den Diagramm-Modus ändern"
diff --git a/app/locales/en/messages.po b/app/locales/en/messages.po
index ec4b5280a..e715fa93d 100644
--- a/app/locales/en/messages.po
+++ b/app/locales/en/messages.po
@@ -421,7 +421,6 @@ msgstr "Description"
 #: app/charts/shared/chart-data-filters.tsx
 #: app/configurator/components/field.tsx
 #: app/configurator/components/field.tsx
-#: app/configurator/components/field.tsx
 msgid "controls.dimensionvalue.none"
 msgstr "No Filter"
 
@@ -441,6 +440,10 @@ msgstr "Select all"
 msgid "controls.filter.select.none"
 msgstr "Select none"
 
+#: app/configurator/components/field.tsx
+msgid "controls.filter.use-most-recent"
+msgstr "Use most recent"
+
 #: app/configurator/components/chart-options-selector.tsx
 msgid "controls.filters.interactive.calculation"
 msgstr "Allow users to change chart mode"
diff --git a/app/locales/fr/messages.po b/app/locales/fr/messages.po
index e8dede78a..080e87721 100644
--- a/app/locales/fr/messages.po
+++ b/app/locales/fr/messages.po
@@ -421,7 +421,6 @@ msgstr "Description"
 #: app/charts/shared/chart-data-filters.tsx
 #: app/configurator/components/field.tsx
 #: app/configurator/components/field.tsx
-#: app/configurator/components/field.tsx
 msgid "controls.dimensionvalue.none"
 msgstr "Aucune filtre"
 
@@ -441,6 +440,10 @@ msgstr "Tout sélectionner"
 msgid "controls.filter.select.none"
 msgstr "Tout déselectionner"
 
+#: app/configurator/components/field.tsx
+msgid "controls.filter.use-most-recent"
+msgstr "Utiliser le plus récent"
+
 #: app/configurator/components/chart-options-selector.tsx
 msgid "controls.filters.interactive.calculation"
 msgstr "Permettre aux utilisateurs de changer de mode graphique"
diff --git a/app/locales/it/messages.po b/app/locales/it/messages.po
index 07d1acb71..4a873d501 100644
--- a/app/locales/it/messages.po
+++ b/app/locales/it/messages.po
@@ -421,7 +421,6 @@ msgstr "Descrizione"
 #: app/charts/shared/chart-data-filters.tsx
 #: app/configurator/components/field.tsx
 #: app/configurator/components/field.tsx
-#: app/configurator/components/field.tsx
 msgid "controls.dimensionvalue.none"
 msgstr "Nessun filtro"
 
@@ -441,6 +440,10 @@ msgstr "Seleziona tutti"
 msgid "controls.filter.select.none"
 msgstr "Deseleziona tutto"
 
+#: app/configurator/components/field.tsx
+msgid "controls.filter.use-most-recent"
+msgstr "Usare il più recente"
+
 #: app/configurator/components/chart-options-selector.tsx
 msgid "controls.filters.interactive.calculation"
 msgstr "Consentire agli utenti di cambiare la modalità del grafico"
diff --git a/app/rdf/queries.ts b/app/rdf/queries.ts
index 14f8926af..4b132c2f4 100644
--- a/app/rdf/queries.ts
+++ b/app/rdf/queries.ts
@@ -1,4 +1,3 @@
-import { SELECT } from "@tpluscode/sparql-builder";
 import { descending, group, index } from "d3";
 import { Maybe } from "graphql-tools";
 import keyBy from "lodash/keyBy";
@@ -39,6 +38,7 @@ import {
 } from "./parse";
 import {
   loadDimensionValues,
+  loadMaxDimensionValue,
   loadMinMaxDimensionValues,
 } from "./query-dimension-values";
 import { loadResourceLabels } from "./query-labels";
@@ -343,10 +343,13 @@ export const getCubeDimensionValuesWithMetadata = async ({
     const loaders = [
       filters ? undefined : () => dimension.in ?? [],
       () =>
-        loadDimensionValues(
-          { datasetIri: cube.term, dimension, cube, sparqlClient },
-          filters
-        ),
+        loadDimensionValues({
+          datasetIri: cube.term,
+          dimension,
+          cube,
+          sparqlClient,
+          filters,
+        }),
     ].filter(truthy);
 
     for (const loader of loaders) {
@@ -864,27 +867,15 @@ const buildFilters = async ({
       switch (filter.type) {
         case "single": {
           if (isDynamicMaxValue(filter.value)) {
-            if (cubeDimension.maxInclusive) {
-              return [
-                filterDimension.filter.eq(
-                  toRDFValue(cubeDimension.maxInclusive.value)
-                ),
-              ];
-            }
-
-            // Ideally we would query the max value directly in the observations
-            // query, but it doesn't seem to be supported by the cube-view-query
-            const maxValueQuery = SELECT`(MAX(?value) as ?value)`
-              .WHERE` <${cube.term?.value}> <https://cube.link/observationSet> ?observationSet .
-  ?observationSet <https://cube.link/observation> ?source .
-  ?source <${cubeDimension.path?.value}> ?value .`;
-            const maxValueRaw = await maxValueQuery.execute(
-              sparqlClient.query,
-              { operation: "postUrlencoded" }
-            );
-            const maxValue = maxValueRaw?.[0]?.value?.value as string;
-
-            return [filterDimension.filter.eq(toRDFValue(maxValue))];
+            const maxValue = await loadMaxDimensionValue({
+              datasetIri: cube.term,
+              dimension: cubeDimension,
+              cube,
+              sparqlClient,
+              filters,
+            });
+
+            return [filterDimension.filter.eq(toRDFValue(maxValue[0].value))];
           }
 
           return [filterDimension.filter.eq(toRDFValue(`${filter.value}`))];
diff --git a/app/rdf/query-dimension-values.ts b/app/rdf/query-dimension-values.ts
index 60a6aa159..a097f1105 100644
--- a/app/rdf/query-dimension-values.ts
+++ b/app/rdf/query-dimension-values.ts
@@ -1,3 +1,4 @@
+import RDF from "@rdfjs/data-model";
 import { SELECT, sparql } from "@tpluscode/sparql-builder";
 import keyBy from "lodash/keyBy";
 import mapValues from "lodash/mapValues";
@@ -8,6 +9,7 @@ import { Literal, NamedNode, Term } from "rdf-js";
 import { ParsingClient } from "sparql-http-client/ParsingClient";
 import { LRUCache } from "typescript-lru-cache";
 
+import { isDynamicMaxValue } from "@/configurator/components/field";
 import { FIELD_VALUE_NONE } from "@/configurator/constants";
 import { parseObservationValue } from "@/domain/data";
 import { pragmas } from "@/rdf/create-source";
@@ -124,6 +126,14 @@ const getFilterOrder = (filter: Filters[number]) => {
   }
 };
 
+type LoadDimensionValuesProps = {
+  datasetIri: Term | undefined;
+  dimension: CubeDimension;
+  cube: ExtendedCube;
+  sparqlClient: ParsingClient;
+  filters?: Filters;
+};
+
 /**
  * Load dimension values.
  *
@@ -131,74 +141,19 @@ const getFilterOrder = (filter: Filters[number]) => {
  *
  */
 export async function loadDimensionValues(
-  {
-    datasetIri,
-    dimension,
-    cube,
-    sparqlClient,
-  }: {
-    datasetIri: Term | undefined;
-    dimension: CubeDimension;
-    cube: ExtendedCube;
-    sparqlClient: ParsingClient;
-  },
-  filters?: Filters
+  props: LoadDimensionValuesProps
 ): Promise<Array<Literal | NamedNode>> {
+  const { datasetIri, dimension, cube, sparqlClient, filters } = props;
   const dimensionIri = dimension.path;
-  const allFiltersList = filters ? Object.entries(filters) : [];
-  const filterList =
-    // Consider filters before the current filter to fetch the values for
-    // the current filter
-    sortBy(
-      allFiltersList.slice(
-        0,
-        allFiltersList.findIndex(([iri]) => iri == dimensionIri?.value)
-      ),
-      ([, filterValue]) => getFilterOrder(filterValue)
-    );
+  const filterList = filters
+    ? getFiltersList(filters, dimensionIri?.value)
+    : [];
 
   const query = SELECT.DISTINCT`?value`.WHERE`
     ${datasetIri} ${cubeNs.observationSet} ?observationSet .
     ?observationSet ${cubeNs.observation} ?observation .
     ?observation ${dimensionIri} ?value .
-    ${
-      filters
-        ? filterList.map(([iri, value], idx) => {
-            const filterDimension = cube.dimensions.find(
-              (d) => d.path?.value === iri
-            );
-
-            if (!filterDimension || dimensionIri?.value === iri) {
-              return "";
-            }
-
-            if (value.type === "single" && value.value === FIELD_VALUE_NONE) {
-              return "";
-            }
-
-            // Ignore range filters for now.
-            if (value.type === "range") {
-              return "";
-            }
-            const versioned = filterDimension
-              ? dimensionIsVersioned(filterDimension)
-              : false;
-
-            return sparql`${
-              versioned
-                ? sparql`?dimension${idx} ${ns.schema.sameAs} ?dimension_unversioned${idx}.`
-                : ""
-            }
-            ?observation <${iri}> ?dimension${idx}.
-            ${formatFilterIntoSparqlFilter(
-              value,
-              filterDimension,
-              versioned,
-              idx
-            )}`;
-          })
-        : ""
-    }
+    ${getQueryFilters(filterList, cube, dimensionIri?.value)}
   `.prologue`${pragmas}`;
 
   let result: Array<DimensionValue> = [];
@@ -208,12 +163,110 @@ export async function loadDimensionValues(
       operation: "postUrlencoded",
     })) as unknown as Array<DimensionValue>;
   } catch {
-    console.warn(`Failed to fetch dimension values for ${datasetIri}.`);
+    console.warn(`Failed to fetch dimension values for ${datasetIri}!`);
   } finally {
     return result.map((d) => d.value);
   }
 }
 
+/**
+ * Load max dimension value.
+ *
+ * Filters on other dimensions can be passed.
+ *
+ */
+export async function loadMaxDimensionValue(
+  props: LoadDimensionValuesProps
+): Promise<Array<Literal | NamedNode>> {
+  const { datasetIri, dimension, cube, sparqlClient, filters } = props;
+  const dimensionIri = dimension.path;
+  const filterList = filters
+    ? getFiltersList(filters, dimensionIri?.value)
+    : [];
+
+  // The following query works both for numeric, date and ordinal dimensions
+  const query = SELECT`?value`.WHERE`
+    ${datasetIri} ${cubeNs.observationSet} ?observationSet .
+    ?observationSet ${cubeNs.observation} ?observation .
+    ?observation ${dimensionIri} ?value .
+    OPTIONAL {
+      ?value <https://www.w3.org/TR/owl-time/hasEnd> ?hasEnd .
+      ?value ${ns.schema.position} ?position .
+    }
+    ${getQueryFilters(filterList, cube, dimensionIri?.value)}
+  `
+    .ORDER()
+    .BY(RDF.variable("hasEnd"), true)
+    .THEN.BY(RDF.variable("value"), true)
+    .THEN.BY(RDF.variable("position"), true)
+    .LIMIT(1).prologue`${pragmas}`;
+
+  let result: Array<DimensionValue> = [];
+
+  try {
+    result = (await query.execute(sparqlClient.query, {
+      operation: "postUrlencoded",
+    })) as unknown as Array<DimensionValue>;
+  } catch {
+    console.warn(`Failed to fetch max dimension value for ${datasetIri}!`);
+  } finally {
+    return result.map((d) => d.value);
+  }
+}
+
+const getFiltersList = (filters: Filters, dimensionIri: string | undefined) => {
+  const entries = Object.entries(filters);
+  // Consider filters before the current filter to fetch the values for
+  // the current filter
+  return sortBy(
+    entries.slice(
+      0,
+      entries.findIndex(([iri]) => iri == dimensionIri)
+    ),
+    ([, v]) => getFilterOrder(v)
+  );
+};
+
+const getQueryFilters = (
+  filtersList: ReturnType<typeof getFiltersList>,
+  cube: ExtendedCube,
+  dimensionIri: string | undefined
+) => {
+  return filtersList.length > 0
+    ? filtersList.map(([iri, value], i) => {
+        const dimension = cube.dimensions.find((d) => d.path?.value === iri);
+
+        // Ignore the current dimension
+        if (!dimension || dimensionIri === iri) {
+          return "";
+        }
+
+        // Ignore filters with no value or with the special value
+        if (
+          value.type === "single" &&
+          (value.value === FIELD_VALUE_NONE || isDynamicMaxValue(value.value))
+        ) {
+          return "";
+        }
+
+        // Ignore range filters for now
+        if (value.type === "range") {
+          return "";
+        }
+
+        const versioned = dimension ? dimensionIsVersioned(dimension) : false;
+
+        return sparql`${
+          versioned
+            ? sparql`?dimension${i} ${ns.schema.sameAs} ?dimension_unversioned${i}.`
+            : ""
+        }
+      ?observation <${iri}> ?dimension${i}.
+      ${formatFilterIntoSparqlFilter(value, dimension, versioned, i)}`;
+      })
+    : "";
+};
+
 type MinMaxResult = [{ minValue: LiteralExt; maxValue: LiteralExt }];
 
 const parseMinMax = (result: MinMaxResult) => {
diff --git a/app/themes/federal.tsx b/app/themes/federal.tsx
index 5c39537af..c89c79d4f 100644
--- a/app/themes/federal.tsx
+++ b/app/themes/federal.tsx
@@ -637,12 +637,17 @@ theme.components = {
   },
   MuiSwitch: {
     styleOverrides: {
-      root: {
-        width: 28,
-        height: 16,
-        padding: 0,
-
+      root: ({ ownerState }) => ({
         display: "flex",
+        ...(ownerState.size === "small" && {
+          width: 24,
+          height: 12,
+        }),
+        ...(ownerState.size === "medium" && {
+          width: 28,
+          height: 16,
+        }),
+        padding: 0,
 
         "& .MuiSwitch-switchBase": {
           padding: 2,
@@ -661,8 +666,14 @@ theme.components = {
         },
         "& .MuiSwitch-thumb": {
           backgroundColor: theme.palette.background.paper,
-          width: 12,
-          height: 12,
+          ...(ownerState.size === "small" && {
+            width: 8,
+            height: 8,
+          }),
+          ...(ownerState.size === "medium" && {
+            width: 12,
+            height: 12,
+          }),
           borderRadius: 6,
           transition: theme.transitions.create(["width"], {
             duration: 200,
@@ -683,7 +694,7 @@ theme.components = {
             transform: "translateX(9px)",
           },
         },
-      },
+      }),
     },
   },
   MuiTableCell: {