diff --git a/app/configurator/map/map-chart-options.tsx b/app/configurator/map/map-chart-options.tsx
index 3b1c5b18b..f96daa8df 100644
--- a/app/configurator/map/map-chart-options.tsx
+++ b/app/configurator/map/map-chart-options.tsx
@@ -1,6 +1,6 @@
 import { t, Trans } from "@lingui/macro";
 import React, { memo, useMemo } from "react";
-import { Flex } from "theme-ui";
+import { Box, Flex } from "theme-ui";
 import { ConfiguratorStateConfiguringChart, MapConfig } from "..";
 import { FieldSetLegend } from "../../components/form";
 import {
@@ -146,9 +146,16 @@ export const AreaLayerSettings = memo(
       chartConfig.fields.areaLayer.nbClass;
     const currentColorScaleType = chartConfig.fields.areaLayer.colorScaleType;
 
-    const disabled = !chartConfig.fields.areaLayer.show;
+    const isAvailable = geoShapesDimensions.length > 0;
+    const isHidden = !chartConfig.fields.areaLayer.show;
 
-    return (
+    return !isAvailable ? (
+      <Box sx={{ my: 3, py: 3, px: 5, width: "80%" }}>
+        <Trans id="controls.section.map.noGeoDimensions">
+          In this dataset there are no geographical dimensions to display!
+        </Trans>
+      </Box>
+    ) : (
       <>
         <ControlSection>
           <SectionTitle iconName="settings">
@@ -162,7 +169,6 @@ export const AreaLayerSettings = memo(
               })}
               field="areaLayer"
               path="show"
-              disabled={geoShapesDimensions.length === 0}
             />
           </ControlSectionContent>
         </ControlSection>
@@ -177,7 +183,7 @@ export const AreaLayerSettings = memo(
               field={activeField}
               path="componentIri"
               options={geoShapesDimensionsOptions}
-              disabled={disabled}
+              disabled={isHidden}
             />
           </ControlSectionContent>
         </ControlSection>
@@ -191,7 +197,7 @@ export const AreaLayerSettings = memo(
               path="hierarchyLevel"
               options={hierarchyLevelOptions}
               getValue={(d) => +d}
-              disabled={disabled}
+              disabled={isHidden}
             />
           </ControlSectionContent>
         </ControlSection>
@@ -204,7 +210,7 @@ export const AreaLayerSettings = memo(
               field={activeField}
               path="measureIri"
               options={measuresOptions}
-              disabled={disabled}
+              disabled={isHidden}
             />
           </ControlSectionContent>
         </ControlSection>
@@ -218,7 +224,7 @@ export const AreaLayerSettings = memo(
                 field={activeField}
                 path="colorScaleType"
                 value="continuous"
-                disabled={disabled}
+                disabled={isHidden}
               />
 
               {/* Limit the number of clusters to min. 3 */}
@@ -228,7 +234,7 @@ export const AreaLayerSettings = memo(
                   field={activeField}
                   path="colorScaleType"
                   value="discrete"
-                  disabled={disabled}
+                  disabled={isHidden}
                 />
               )}
             </Flex>
@@ -241,7 +247,7 @@ export const AreaLayerSettings = memo(
                   ? currentNumberOfColorScaleClasses
                   : undefined
               }
-              disabled={disabled}
+              disabled={isHidden}
             />
 
             {chartConfig.fields.areaLayer.colorScaleType === "discrete" &&
@@ -276,7 +282,7 @@ export const AreaLayerSettings = memo(
                         value: "jenks",
                       },
                     ]}
-                    disabled={disabled}
+                    disabled={isHidden}
                   />
                   <ChartOptionSelectField<number>
                     id="areaLayer.nbClass"
@@ -284,8 +290,8 @@ export const AreaLayerSettings = memo(
                     field={activeField}
                     path="nbClass"
                     options={numberOfColorScaleClasses}
-                    disabled={disabled}
                     getValue={(d) => +d}
+                    disabled={isHidden}
                   />
                 </>
               )}
@@ -327,9 +333,16 @@ export const SymbolLayerSettings = memo(
       [metaData.measures]
     );
 
-    const disabled = !chartConfig.fields.symbolLayer.show;
+    const isAvailable = geoDimensions.length > 0;
+    const isHidden = !chartConfig.fields.symbolLayer.show;
 
-    return (
+    return !isAvailable ? (
+      <Box sx={{ my: 3, py: 3, px: 5, width: "80%" }}>
+        <Trans id="controls.section.map.noGeoDimensions">
+          In this dataset there are no geographical dimensions to display!
+        </Trans>
+      </Box>
+    ) : (
       <>
         <ControlSection>
           <SectionTitle iconName="settings">
@@ -343,7 +356,6 @@ export const SymbolLayerSettings = memo(
               })}
               field="symbolLayer"
               path="show"
-              disabled={geoDimensions.length === 0}
             />
           </ControlSectionContent>
         </ControlSection>
@@ -358,7 +370,7 @@ export const SymbolLayerSettings = memo(
               field={activeField}
               path="componentIri"
               options={geoDimensionsOptions}
-              disabled={disabled}
+              disabled={isHidden}
             />
           </ControlSectionContent>
         </ControlSection>
@@ -371,7 +383,7 @@ export const SymbolLayerSettings = memo(
               field={activeField}
               path="measureIri"
               options={measuresOptions}
-              disabled={disabled}
+              disabled={isHidden}
             />
           </ControlSectionContent>
         </ControlSection>
@@ -382,7 +394,7 @@ export const SymbolLayerSettings = memo(
               label="Select a color"
               field={activeField}
               path="color"
-              disabled={disabled}
+              disabled={isHidden}
             />
           </ControlSectionContent>
         </ControlSection>
diff --git a/app/locales/de/messages.po b/app/locales/de/messages.po
index 7f784f815..f0dab7cd1 100644
--- a/app/locales/de/messages.po
+++ b/app/locales/de/messages.po
@@ -13,19 +13,23 @@ msgstr ""
 "Language-Team: \n"
 "Plural-Forms: \n"
 
+#: app/configurator/components/chart-configurator.tsx:385
+msgid "Add filter"
+msgstr ""
+
 #: app/components/search-autocomplete.tsx:69
 msgid "Browse {0}"
 msgstr "{0} durchsuchen"
 
-#: app/configurator/components/chart-configurator.tsx:337
+#: app/configurator/components/chart-configurator.tsx:341
 msgid "Drag filters to reorganize"
 msgstr "Ziehen Sie die Filter per Drag & Drop, um sie neu zu organisieren"
 
-#: app/configurator/components/chart-configurator.tsx:334
+#: app/configurator/components/chart-configurator.tsx:338
 msgid "Move filter down"
 msgstr "Filter nach unten verschieben"
 
-#: app/configurator/components/chart-configurator.tsx:331
+#: app/configurator/components/chart-configurator.tsx:335
 msgid "Move filter up"
 msgstr "Filter nach oben verschieben"
 
@@ -138,9 +142,9 @@ msgstr "Teilen"
 #~ msgid "chart.map.layers.area.discretization.discrete"
 #~ msgstr "Diskret"
 
-#: app/charts/map/prototype-right-controls.tsx:186
-#~ msgid "chart.map.layers.area.discretization.jenks"
-#~ msgstr "Jenks (Natural Breaks)"
+#: app/configurator/map/map-chart-options.tsx:278
+msgid "chart.map.layers.area.discretization.jenks"
+msgstr "Jenks (Natural Breaks)"
 
 #: app/charts/map/prototype-right-controls.tsx:140
 #~ msgid "chart.map.layers.area.discretization.linear"
@@ -150,13 +154,13 @@ msgstr "Teilen"
 #~ msgid "chart.map.layers.area.discretization.number.class"
 #~ msgstr "Anzahl Klassen"
 
-#: app/charts/map/prototype-right-controls.tsx:173
-#~ msgid "chart.map.layers.area.discretization.quantiles"
-#~ msgstr "Quantile (gleiche Anzahl Werte)"
+#: app/configurator/map/map-chart-options.tsx:271
+msgid "chart.map.layers.area.discretization.quantiles"
+msgstr "Quantile (gleiche Anzahl Werte)"
 
-#: app/charts/map/prototype-right-controls.tsx:160
-#~ msgid "chart.map.layers.area.discretization.quantize"
-#~ msgstr "Quantisierung (gleiche Wertebereiche)"
+#: app/configurator/map/map-chart-options.tsx:264
+msgid "chart.map.layers.area.discretization.quantize"
+msgstr "Quantisierung (gleiche Wertebereiche)"
 
 #: app/charts/map/prototype-right-controls.tsx:91
 #~ msgid "chart.map.layers.area.select.measure"
@@ -239,11 +243,11 @@ msgstr "Horizontale Achse"
 msgid "controls.axis.vertical"
 msgstr "Vertikale Achse"
 
-#: app/configurator/map/map-chart-options.tsx:76
+#: app/configurator/map/map-chart-options.tsx:71
 msgid "controls.baseLayer.showLakes"
 msgstr ""
 
-#: app/configurator/map/map-chart-options.tsx:68
+#: app/configurator/map/map-chart-options.tsx:63
 msgid "controls.baseLayer.showRelief"
 msgstr ""
 
@@ -288,20 +292,20 @@ msgid "controls.color.add"
 msgstr "Hinzufügen …"
 
 #: app/configurator/components/chart-controls/color-palette.tsx:78
-#: app/configurator/components/chart-controls/color-ramp.tsx:106
+#: app/configurator/components/chart-controls/color-ramp.tsx:124
 msgid "controls.color.palette"
 msgstr "Farbpalette"
 
-#: app/configurator/components/chart-controls/color-ramp.tsx:147
+#: app/configurator/components/chart-controls/color-ramp.tsx:146
 msgid "controls.color.palette.diverging"
 msgstr "Divergierend"
 
-#: app/configurator/components/chart-controls/color-palette.tsx:257
-#: app/configurator/components/chart-controls/color-palette.tsx:263
+#: app/configurator/components/chart-controls/color-palette.tsx:237
+#: app/configurator/components/chart-controls/color-palette.tsx:243
 msgid "controls.color.palette.reset"
 msgstr "Farbpalette zurücksetzen"
 
-#: app/configurator/components/chart-controls/color-ramp.tsx:161
+#: app/configurator/components/chart-controls/color-ramp.tsx:159
 msgid "controls.color.palette.sequential"
 msgstr "Sequentiell"
 
@@ -361,18 +365,18 @@ msgid "controls.imputation"
 msgstr "Imputationstyp"
 
 #: app/configurator/components/chart-options-selector.tsx:490
-#: app/configurator/components/ui-helpers.ts:465
+#: app/configurator/components/ui-helpers.ts:473
 msgid "controls.imputation.type.linear"
 msgstr "Lineare Interpolation"
 
 #: app/configurator/components/chart-options-selector.tsx:483
 #: app/configurator/components/chart-options-selector.tsx:495
-#: app/configurator/components/ui-helpers.ts:457
+#: app/configurator/components/ui-helpers.ts:465
 msgid "controls.imputation.type.none"
 msgstr "-"
 
 #: app/configurator/components/chart-options-selector.tsx:485
-#: app/configurator/components/ui-helpers.ts:461
+#: app/configurator/components/ui-helpers.ts:469
 msgid "controls.imputation.type.zeros"
 msgstr "Nullen"
 
@@ -441,15 +445,15 @@ msgstr "Aus"
 msgid "controls.search.clear"
 msgstr "Suche zurücksetzen"
 
-#: app/configurator/map/map-chart-options.tsx:158
+#: app/configurator/map/map-chart-options.tsx:162
 msgid "controls.section.areaLayer"
 msgstr ""
 
-#: app/configurator/map/map-chart-options.tsx:64
+#: app/configurator/map/map-chart-options.tsx:59
 msgid "controls.section.baseLayer"
 msgstr ""
 
-#: app/configurator/components/chart-configurator.tsx:258
+#: app/configurator/components/chart-configurator.tsx:262
 msgid "controls.section.chart.options"
 msgstr "Diagramm-Einstellungen"
 
@@ -461,7 +465,7 @@ msgstr "Spalten"
 msgid "controls.section.columnstyle"
 msgstr "Spaltenstil"
 
-#: app/configurator/components/chart-configurator.tsx:273
+#: app/configurator/components/chart-configurator.tsx:277
 msgid "controls.section.data.filters"
 msgstr "Filter"
 
@@ -498,11 +502,16 @@ msgstr "Interaktive Filter hinzufügen"
 msgid "controls.section.interactiveFilters.dataFilters"
 msgstr "Datenfilter"
 
+#: app/configurator/map/map-chart-options.tsx:154
+#: app/configurator/map/map-chart-options.tsx:341
+msgid "controls.section.map.noGeoDimensions"
+msgstr "In diesem Datenset können keine geografischen Dimensionen angezeigt werden!"
+
 #: app/configurator/components/chart-options-selector.tsx:411
 msgid "controls.section.sorting"
 msgstr "Sortieren"
 
-#: app/configurator/map/map-chart-options.tsx:329
+#: app/configurator/map/map-chart-options.tsx:349
 msgid "controls.section.symbolLayer"
 msgstr ""
 
@@ -745,11 +754,11 @@ msgstr "Luftzug"
 msgid "datatable.showing.first.rows"
 msgstr "Die ersten 10 Zeilen werden angezeigt"
 
-#: app/configurator/map/map-chart-options.tsx:162
+#: app/configurator/map/map-chart-options.tsx:166
 msgid "fields.areaLayer.show"
 msgstr ""
 
-#: app/configurator/map/map-chart-options.tsx:333
+#: app/configurator/map/map-chart-options.tsx:353
 msgid "fields.symbolLayer.show"
 msgstr ""
 
@@ -761,11 +770,11 @@ msgstr "Bundesamt für Umwelt BAFU"
 msgid "footer.institution.url"
 msgstr "https://www.bafu.admin.ch/bafu/de/home.html"
 
-#: app/components/hint.tsx:197
+#: app/components/hint.tsx:199
 msgid "hint.chartunexpected.message"
 msgstr ""
 
-#: app/components/hint.tsx:194
+#: app/components/hint.tsx:196
 msgid "hint.chartunexpected.title"
 msgstr ""
 
@@ -773,11 +782,11 @@ msgstr ""
 msgid "hint.create.your.own.chart"
 msgstr "Sie können diese Visualisierung kopieren oder mit Schweizer Open Government Data eine neue Visualisierung erstellen."
 
-#: app/components/hint.tsx:171
+#: app/components/hint.tsx:173
 msgid "hint.dataloadingerror.message"
 msgstr "Die Daten konnten nicht geladen werden."
 
-#: app/components/hint.tsx:168
+#: app/components/hint.tsx:170
 msgid "hint.dataloadingerror.title"
 msgstr "Daten-Ladefehler"
 
@@ -793,7 +802,7 @@ msgstr "Lade Daten …"
 msgid "hint.no.visualization.with.dataset"
 msgstr "Mit dem ausgewählten Datensatz kann keine Visualisierung erstellt werden."
 
-#: app/components/hint.tsx:146
+#: app/components/hint.tsx:148
 msgid "hint.nodata.message"
 msgstr "Bitte versuchen Sie es mit einer anderen Filterkombination."
 
@@ -801,15 +810,15 @@ msgstr "Bitte versuchen Sie es mit einer anderen Filterkombination."
 msgid "hint.nodata.title"
 msgstr "Keine Daten für die aktuelle Filterauswahl"
 
-#: app/components/hint.tsx:223
+#: app/components/hint.tsx:225
 msgid "hint.only.negative.data.message"
 msgstr "Negative Datenwerte können mit diesem Diagrammtyp nicht dargestellt werden."
 
-#: app/components/hint.tsx:220
+#: app/components/hint.tsx:222
 msgid "hint.only.negative.data.title"
 msgstr "Negative Werte"
 
-#: app/components/hint.tsx:248
+#: app/components/hint.tsx:250
 msgid "hint.publication.success"
 msgstr "Die Visualisierung ist jetzt veröffentlicht. Sie können sie teilen oder einbetten, indem Sie die URL kopieren oder das Menü unten verwenden."
 
diff --git a/app/locales/en/messages.po b/app/locales/en/messages.po
index 5dc3ceefd..c4e36c3ed 100644
--- a/app/locales/en/messages.po
+++ b/app/locales/en/messages.po
@@ -13,19 +13,23 @@ msgstr ""
 "Language-Team: \n"
 "Plural-Forms: \n"
 
+#: app/configurator/components/chart-configurator.tsx:385
+msgid "Add filter"
+msgstr "Add filter"
+
 #: app/components/search-autocomplete.tsx:69
 msgid "Browse {0}"
 msgstr "Browse {0}"
 
-#: app/configurator/components/chart-configurator.tsx:337
+#: app/configurator/components/chart-configurator.tsx:341
 msgid "Drag filters to reorganize"
 msgstr "Drag filters to reorganize"
 
-#: app/configurator/components/chart-configurator.tsx:334
+#: app/configurator/components/chart-configurator.tsx:338
 msgid "Move filter down"
 msgstr "Move filter down"
 
-#: app/configurator/components/chart-configurator.tsx:331
+#: app/configurator/components/chart-configurator.tsx:335
 msgid "Move filter up"
 msgstr "Move filter up"
 
@@ -138,9 +142,9 @@ msgstr "Share"
 #~ msgid "chart.map.layers.area.discretization.discrete"
 #~ msgstr "Discrete"
 
-#: app/charts/map/prototype-right-controls.tsx:186
-#~ msgid "chart.map.layers.area.discretization.jenks"
-#~ msgstr "Jenks (natural breaks)"
+#: app/configurator/map/map-chart-options.tsx:278
+msgid "chart.map.layers.area.discretization.jenks"
+msgstr "Jenks (natural breaks)"
 
 #: app/charts/map/prototype-right-controls.tsx:140
 #~ msgid "chart.map.layers.area.discretization.linear"
@@ -150,13 +154,13 @@ msgstr "Share"
 #~ msgid "chart.map.layers.area.discretization.number.class"
 #~ msgstr "Number of classes"
 
-#: app/charts/map/prototype-right-controls.tsx:173
-#~ msgid "chart.map.layers.area.discretization.quantiles"
-#~ msgstr "Quantiles (equal distribution of values)"
+#: app/configurator/map/map-chart-options.tsx:271
+msgid "chart.map.layers.area.discretization.quantiles"
+msgstr "Quantiles (equal distribution of values)"
 
-#: app/charts/map/prototype-right-controls.tsx:160
-#~ msgid "chart.map.layers.area.discretization.quantize"
-#~ msgstr "Quantize (equal intervals)"
+#: app/configurator/map/map-chart-options.tsx:264
+msgid "chart.map.layers.area.discretization.quantize"
+msgstr "Quantize (equal intervals)"
 
 #: app/charts/map/prototype-right-controls.tsx:91
 #~ msgid "chart.map.layers.area.select.measure"
@@ -239,11 +243,11 @@ msgstr "Horizontal Axis"
 msgid "controls.axis.vertical"
 msgstr "Vertical Axis"
 
-#: app/configurator/map/map-chart-options.tsx:76
+#: app/configurator/map/map-chart-options.tsx:71
 msgid "controls.baseLayer.showLakes"
 msgstr "Show lakes"
 
-#: app/configurator/map/map-chart-options.tsx:68
+#: app/configurator/map/map-chart-options.tsx:63
 msgid "controls.baseLayer.showRelief"
 msgstr "Show relief"
 
@@ -288,20 +292,20 @@ msgid "controls.color.add"
 msgstr "Add ..."
 
 #: app/configurator/components/chart-controls/color-palette.tsx:78
-#: app/configurator/components/chart-controls/color-ramp.tsx:106
+#: app/configurator/components/chart-controls/color-ramp.tsx:124
 msgid "controls.color.palette"
 msgstr "Color palette"
 
-#: app/configurator/components/chart-controls/color-ramp.tsx:147
+#: app/configurator/components/chart-controls/color-ramp.tsx:146
 msgid "controls.color.palette.diverging"
 msgstr "Diverging"
 
-#: app/configurator/components/chart-controls/color-palette.tsx:257
-#: app/configurator/components/chart-controls/color-palette.tsx:263
+#: app/configurator/components/chart-controls/color-palette.tsx:237
+#: app/configurator/components/chart-controls/color-palette.tsx:243
 msgid "controls.color.palette.reset"
 msgstr "Reset color palette"
 
-#: app/configurator/components/chart-controls/color-ramp.tsx:161
+#: app/configurator/components/chart-controls/color-ramp.tsx:159
 msgid "controls.color.palette.sequential"
 msgstr "Sequential"
 
@@ -361,18 +365,18 @@ msgid "controls.imputation"
 msgstr "Imputation type"
 
 #: app/configurator/components/chart-options-selector.tsx:490
-#: app/configurator/components/ui-helpers.ts:465
+#: app/configurator/components/ui-helpers.ts:473
 msgid "controls.imputation.type.linear"
 msgstr "Linear interpolation"
 
 #: app/configurator/components/chart-options-selector.tsx:483
 #: app/configurator/components/chart-options-selector.tsx:495
-#: app/configurator/components/ui-helpers.ts:457
+#: app/configurator/components/ui-helpers.ts:465
 msgid "controls.imputation.type.none"
 msgstr "-"
 
 #: app/configurator/components/chart-options-selector.tsx:485
-#: app/configurator/components/ui-helpers.ts:461
+#: app/configurator/components/ui-helpers.ts:469
 msgid "controls.imputation.type.zeros"
 msgstr "Zeros"
 
@@ -441,15 +445,15 @@ msgstr "Off"
 msgid "controls.search.clear"
 msgstr "Clear search field"
 
-#: app/configurator/map/map-chart-options.tsx:158
+#: app/configurator/map/map-chart-options.tsx:162
 msgid "controls.section.areaLayer"
 msgstr "Settings"
 
-#: app/configurator/map/map-chart-options.tsx:64
+#: app/configurator/map/map-chart-options.tsx:59
 msgid "controls.section.baseLayer"
 msgstr "Settings"
 
-#: app/configurator/components/chart-configurator.tsx:258
+#: app/configurator/components/chart-configurator.tsx:262
 msgid "controls.section.chart.options"
 msgstr "Chart Options"
 
@@ -461,7 +465,7 @@ msgstr "Columns"
 msgid "controls.section.columnstyle"
 msgstr "Column Style"
 
-#: app/configurator/components/chart-configurator.tsx:273
+#: app/configurator/components/chart-configurator.tsx:277
 msgid "controls.section.data.filters"
 msgstr "Filters"
 
@@ -498,11 +502,16 @@ msgstr "Interactive Filters"
 msgid "controls.section.interactiveFilters.dataFilters"
 msgstr "Data Filters"
 
+#: app/configurator/map/map-chart-options.tsx:154
+#: app/configurator/map/map-chart-options.tsx:341
+msgid "controls.section.map.noGeoDimensions"
+msgstr "In this dataset there are no geographical dimensions to display!"
+
 #: app/configurator/components/chart-options-selector.tsx:411
 msgid "controls.section.sorting"
 msgstr "Sort"
 
-#: app/configurator/map/map-chart-options.tsx:329
+#: app/configurator/map/map-chart-options.tsx:349
 msgid "controls.section.symbolLayer"
 msgstr "Settings"
 
@@ -745,11 +754,11 @@ msgstr "Draft"
 msgid "datatable.showing.first.rows"
 msgstr "Showing first 10 rows"
 
-#: app/configurator/map/map-chart-options.tsx:162
+#: app/configurator/map/map-chart-options.tsx:166
 msgid "fields.areaLayer.show"
 msgstr "Show layer"
 
-#: app/configurator/map/map-chart-options.tsx:333
+#: app/configurator/map/map-chart-options.tsx:353
 msgid "fields.symbolLayer.show"
 msgstr "Show layer"
 
@@ -761,11 +770,11 @@ msgstr "Federal Office for the Environment FOEN"
 msgid "footer.institution.url"
 msgstr "https://www.bafu.admin.ch/bafu/en/home.html"
 
-#: app/components/hint.tsx:197
+#: app/components/hint.tsx:199
 msgid "hint.chartunexpected.message"
 msgstr "An unexpected error occurred while displaying this chart."
 
-#: app/components/hint.tsx:194
+#: app/components/hint.tsx:196
 msgid "hint.chartunexpected.title"
 msgstr "Unexpected error"
 
@@ -773,11 +782,11 @@ msgstr "Unexpected error"
 msgid "hint.create.your.own.chart"
 msgstr "Create your own version of this visualization by copying it, or start from scratch and make a new visualization using Swiss Open Government Data."
 
-#: app/components/hint.tsx:171
+#: app/components/hint.tsx:173
 msgid "hint.dataloadingerror.message"
 msgstr "The data could not be loaded."
 
-#: app/components/hint.tsx:168
+#: app/components/hint.tsx:170
 msgid "hint.dataloadingerror.title"
 msgstr "Data loading error"
 
@@ -793,7 +802,7 @@ msgstr "Loading data..."
 msgid "hint.no.visualization.with.dataset"
 msgstr "No visualization can be created with the selected dataset."
 
-#: app/components/hint.tsx:146
+#: app/components/hint.tsx:148
 msgid "hint.nodata.message"
 msgstr "Please try with another combination of filters."
 
@@ -801,15 +810,15 @@ msgstr "Please try with another combination of filters."
 msgid "hint.nodata.title"
 msgstr "No data available for current filter selection"
 
-#: app/components/hint.tsx:223
+#: app/components/hint.tsx:225
 msgid "hint.only.negative.data.message"
 msgstr "Negative data values cannot be displayed with this chart type."
 
-#: app/components/hint.tsx:220
+#: app/components/hint.tsx:222
 msgid "hint.only.negative.data.title"
 msgstr "Negative Values"
 
-#: app/components/hint.tsx:248
+#: app/components/hint.tsx:250
 msgid "hint.publication.success"
 msgstr "Your visualization is now published. Share it by copying the URL or use the Embed menu below."
 
diff --git a/app/locales/fr/messages.po b/app/locales/fr/messages.po
index 960061268..b13e0d6fb 100644
--- a/app/locales/fr/messages.po
+++ b/app/locales/fr/messages.po
@@ -13,19 +13,23 @@ msgstr ""
 "Language-Team: \n"
 "Plural-Forms: \n"
 
+#: app/configurator/components/chart-configurator.tsx:385
+msgid "Add filter"
+msgstr ""
+
 #: app/components/search-autocomplete.tsx:69
 msgid "Browse {0}"
 msgstr "Parcourir {0}"
 
-#: app/configurator/components/chart-configurator.tsx:337
+#: app/configurator/components/chart-configurator.tsx:341
 msgid "Drag filters to reorganize"
 msgstr "Faites glisser les filtres pour les réorganiser"
 
-#: app/configurator/components/chart-configurator.tsx:334
+#: app/configurator/components/chart-configurator.tsx:338
 msgid "Move filter down"
 msgstr "Déplacer le filtre vers le bas"
 
-#: app/configurator/components/chart-configurator.tsx:331
+#: app/configurator/components/chart-configurator.tsx:335
 msgid "Move filter up"
 msgstr "Déplacer le filtre vers le haut"
 
@@ -138,9 +142,9 @@ msgstr "Partager"
 #~ msgid "chart.map.layers.area.discretization.discrete"
 #~ msgstr "Discrète"
 
-#: app/charts/map/prototype-right-controls.tsx:186
-#~ msgid "chart.map.layers.area.discretization.jenks"
-#~ msgstr "Jenks (intervalles naturels)"
+#: app/configurator/map/map-chart-options.tsx:278
+msgid "chart.map.layers.area.discretization.jenks"
+msgstr "Jenks (intervalles naturels)"
 
 #: app/charts/map/prototype-right-controls.tsx:140
 #~ msgid "chart.map.layers.area.discretization.linear"
@@ -150,13 +154,13 @@ msgstr "Partager"
 #~ msgid "chart.map.layers.area.discretization.number.class"
 #~ msgstr "Nombre de classes"
 
-#: app/charts/map/prototype-right-controls.tsx:173
-#~ msgid "chart.map.layers.area.discretization.quantiles"
-#~ msgstr "Quantiles (distribution homogène des valeurs)"
+#: app/configurator/map/map-chart-options.tsx:271
+msgid "chart.map.layers.area.discretization.quantiles"
+msgstr "Quantiles (distribution homogène des valeurs)"
 
-#: app/charts/map/prototype-right-controls.tsx:160
-#~ msgid "chart.map.layers.area.discretization.quantize"
-#~ msgstr "Intervalles égaux"
+#: app/configurator/map/map-chart-options.tsx:264
+msgid "chart.map.layers.area.discretization.quantize"
+msgstr "Intervalles égaux"
 
 #: app/charts/map/prototype-right-controls.tsx:91
 #~ msgid "chart.map.layers.area.select.measure"
@@ -239,11 +243,11 @@ msgstr "Axe horizontal"
 msgid "controls.axis.vertical"
 msgstr "Axe vertical"
 
-#: app/configurator/map/map-chart-options.tsx:76
+#: app/configurator/map/map-chart-options.tsx:71
 msgid "controls.baseLayer.showLakes"
 msgstr ""
 
-#: app/configurator/map/map-chart-options.tsx:68
+#: app/configurator/map/map-chart-options.tsx:63
 msgid "controls.baseLayer.showRelief"
 msgstr ""
 
@@ -288,20 +292,20 @@ msgid "controls.color.add"
 msgstr "Ajouter…"
 
 #: app/configurator/components/chart-controls/color-palette.tsx:78
-#: app/configurator/components/chart-controls/color-ramp.tsx:106
+#: app/configurator/components/chart-controls/color-ramp.tsx:124
 msgid "controls.color.palette"
 msgstr "Couleurs"
 
-#: app/configurator/components/chart-controls/color-ramp.tsx:147
+#: app/configurator/components/chart-controls/color-ramp.tsx:146
 msgid "controls.color.palette.diverging"
 msgstr "Divergent"
 
-#: app/configurator/components/chart-controls/color-palette.tsx:257
-#: app/configurator/components/chart-controls/color-palette.tsx:263
+#: app/configurator/components/chart-controls/color-palette.tsx:237
+#: app/configurator/components/chart-controls/color-palette.tsx:243
 msgid "controls.color.palette.reset"
 msgstr "Réinitialiser la palette de couleurs"
 
-#: app/configurator/components/chart-controls/color-ramp.tsx:161
+#: app/configurator/components/chart-controls/color-ramp.tsx:159
 msgid "controls.color.palette.sequential"
 msgstr "Séquentielle"
 
@@ -361,18 +365,18 @@ msgid "controls.imputation"
 msgstr "Type d'imputation"
 
 #: app/configurator/components/chart-options-selector.tsx:490
-#: app/configurator/components/ui-helpers.ts:465
+#: app/configurator/components/ui-helpers.ts:473
 msgid "controls.imputation.type.linear"
 msgstr "Interpolation linéaire"
 
 #: app/configurator/components/chart-options-selector.tsx:483
 #: app/configurator/components/chart-options-selector.tsx:495
-#: app/configurator/components/ui-helpers.ts:457
+#: app/configurator/components/ui-helpers.ts:465
 msgid "controls.imputation.type.none"
 msgstr "-"
 
 #: app/configurator/components/chart-options-selector.tsx:485
-#: app/configurator/components/ui-helpers.ts:461
+#: app/configurator/components/ui-helpers.ts:469
 msgid "controls.imputation.type.zeros"
 msgstr "Zéros"
 
@@ -441,15 +445,15 @@ msgstr "Inactif"
 msgid "controls.search.clear"
 msgstr "Effacer la recherche"
 
-#: app/configurator/map/map-chart-options.tsx:158
+#: app/configurator/map/map-chart-options.tsx:162
 msgid "controls.section.areaLayer"
 msgstr ""
 
-#: app/configurator/map/map-chart-options.tsx:64
+#: app/configurator/map/map-chart-options.tsx:59
 msgid "controls.section.baseLayer"
 msgstr ""
 
-#: app/configurator/components/chart-configurator.tsx:258
+#: app/configurator/components/chart-configurator.tsx:262
 msgid "controls.section.chart.options"
 msgstr "Paramètres graphiques"
 
@@ -461,7 +465,7 @@ msgstr "Colonnes"
 msgid "controls.section.columnstyle"
 msgstr "Style de la colonne"
 
-#: app/configurator/components/chart-configurator.tsx:273
+#: app/configurator/components/chart-configurator.tsx:277
 msgid "controls.section.data.filters"
 msgstr "Filtres"
 
@@ -498,11 +502,16 @@ msgstr "Filtres interactifs"
 msgid "controls.section.interactiveFilters.dataFilters"
 msgstr "Filtres de données"
 
+#: app/configurator/map/map-chart-options.tsx:154
+#: app/configurator/map/map-chart-options.tsx:341
+msgid "controls.section.map.noGeoDimensions"
+msgstr "Dans cet ensemble de données, il n'y a pas de dimensions géographiques à afficher!"
+
 #: app/configurator/components/chart-options-selector.tsx:411
 msgid "controls.section.sorting"
 msgstr "Trier"
 
-#: app/configurator/map/map-chart-options.tsx:329
+#: app/configurator/map/map-chart-options.tsx:349
 msgid "controls.section.symbolLayer"
 msgstr ""
 
@@ -745,11 +754,11 @@ msgstr "Brouillon"
 msgid "datatable.showing.first.rows"
 msgstr "Seules les 10 premières lignes sont affichées"
 
-#: app/configurator/map/map-chart-options.tsx:162
+#: app/configurator/map/map-chart-options.tsx:166
 msgid "fields.areaLayer.show"
 msgstr ""
 
-#: app/configurator/map/map-chart-options.tsx:333
+#: app/configurator/map/map-chart-options.tsx:353
 msgid "fields.symbolLayer.show"
 msgstr ""
 
@@ -761,11 +770,11 @@ msgstr "Office fédéral de l'environnement OFEV"
 msgid "footer.institution.url"
 msgstr "https://www.bafu.admin.ch/bafu/fr/home.html"
 
-#: app/components/hint.tsx:197
+#: app/components/hint.tsx:199
 msgid "hint.chartunexpected.message"
 msgstr ""
 
-#: app/components/hint.tsx:194
+#: app/components/hint.tsx:196
 msgid "hint.chartunexpected.title"
 msgstr ""
 
@@ -773,11 +782,11 @@ msgstr ""
 msgid "hint.create.your.own.chart"
 msgstr "Créez votre propre visualisation à partir de celle-ci en la copiant, ou bien créez une nouvelle visualisation avec les données ouvertes de l'administration publique suisse."
 
-#: app/components/hint.tsx:171
+#: app/components/hint.tsx:173
 msgid "hint.dataloadingerror.message"
 msgstr "Les données n'ont pas pu être téléchargées."
 
-#: app/components/hint.tsx:168
+#: app/components/hint.tsx:170
 msgid "hint.dataloadingerror.title"
 msgstr "Problème de téléchargement des données"
 
@@ -793,7 +802,7 @@ msgstr "Chargement des données..."
 msgid "hint.no.visualization.with.dataset"
 msgstr "Aucune visualisation ne peut être créée avec le jeu de données sélectionné."
 
-#: app/components/hint.tsx:146
+#: app/components/hint.tsx:148
 msgid "hint.nodata.message"
 msgstr "Veuillez essayer avec une autre combinaison de filtres."
 
@@ -801,15 +810,15 @@ msgstr "Veuillez essayer avec une autre combinaison de filtres."
 msgid "hint.nodata.title"
 msgstr "Il n'y a pas de données correspondant aux filtres sélectionnés"
 
-#: app/components/hint.tsx:223
+#: app/components/hint.tsx:225
 msgid "hint.only.negative.data.message"
 msgstr "Ce type de graphique ne permet pas de représenter des données négatives."
 
-#: app/components/hint.tsx:220
+#: app/components/hint.tsx:222
 msgid "hint.only.negative.data.title"
 msgstr "Valeurs négatives"
 
-#: app/components/hint.tsx:248
+#: app/components/hint.tsx:250
 msgid "hint.publication.success"
 msgstr "Votre visualisation est à présent publiée. Partagez-là en copiant l'URL ou en utilisant les options d'intégration."
 
diff --git a/app/locales/it/messages.po b/app/locales/it/messages.po
index f9c88f8c2..b496d23b1 100644
--- a/app/locales/it/messages.po
+++ b/app/locales/it/messages.po
@@ -13,19 +13,23 @@ msgstr ""
 "Language-Team: \n"
 "Plural-Forms: \n"
 
+#: app/configurator/components/chart-configurator.tsx:385
+msgid "Add filter"
+msgstr ""
+
 #: app/components/search-autocomplete.tsx:69
 msgid "Browse {0}"
 msgstr "Sfoglia {0}"
 
-#: app/configurator/components/chart-configurator.tsx:337
+#: app/configurator/components/chart-configurator.tsx:341
 msgid "Drag filters to reorganize"
 msgstr "Trascina i filtri per riorganizzarli"
 
-#: app/configurator/components/chart-configurator.tsx:334
+#: app/configurator/components/chart-configurator.tsx:338
 msgid "Move filter down"
 msgstr "Sposta il filtro in basso"
 
-#: app/configurator/components/chart-configurator.tsx:331
+#: app/configurator/components/chart-configurator.tsx:335
 msgid "Move filter up"
 msgstr "Sposta il filtro in alto"
 
@@ -138,9 +142,9 @@ msgstr "Condividi"
 #~ msgid "chart.map.layers.area.discretization.discrete"
 #~ msgstr "Discreto"
 
-#: app/charts/map/prototype-right-controls.tsx:186
-#~ msgid "chart.map.layers.area.discretization.jenks"
-#~ msgstr "Jenks (interruzioni naturali)"
+#: app/configurator/map/map-chart-options.tsx:278
+msgid "chart.map.layers.area.discretization.jenks"
+msgstr "Jenks (interruzioni naturali)"
 
 #: app/charts/map/prototype-right-controls.tsx:140
 #~ msgid "chart.map.layers.area.discretization.linear"
@@ -150,13 +154,13 @@ msgstr "Condividi"
 #~ msgid "chart.map.layers.area.discretization.number.class"
 #~ msgstr "Numero di classi"
 
-#: app/charts/map/prototype-right-controls.tsx:173
-#~ msgid "chart.map.layers.area.discretization.quantiles"
-#~ msgstr "Quantili (distribuzione omogenea dei valori)"
+#: app/configurator/map/map-chart-options.tsx:271
+msgid "chart.map.layers.area.discretization.quantiles"
+msgstr "Quantili (distribuzione omogenea dei valori)"
 
-#: app/charts/map/prototype-right-controls.tsx:160
-#~ msgid "chart.map.layers.area.discretization.quantize"
-#~ msgstr "Intervalli uguali"
+#: app/configurator/map/map-chart-options.tsx:264
+msgid "chart.map.layers.area.discretization.quantize"
+msgstr "Intervalli uguali"
 
 #: app/charts/map/prototype-right-controls.tsx:91
 #~ msgid "chart.map.layers.area.select.measure"
@@ -239,11 +243,11 @@ msgstr "Asse orizzontale"
 msgid "controls.axis.vertical"
 msgstr "Asse verticale"
 
-#: app/configurator/map/map-chart-options.tsx:76
+#: app/configurator/map/map-chart-options.tsx:71
 msgid "controls.baseLayer.showLakes"
 msgstr ""
 
-#: app/configurator/map/map-chart-options.tsx:68
+#: app/configurator/map/map-chart-options.tsx:63
 msgid "controls.baseLayer.showRelief"
 msgstr ""
 
@@ -288,20 +292,20 @@ msgid "controls.color.add"
 msgstr "Aggiungi ..."
 
 #: app/configurator/components/chart-controls/color-palette.tsx:78
-#: app/configurator/components/chart-controls/color-ramp.tsx:106
+#: app/configurator/components/chart-controls/color-ramp.tsx:124
 msgid "controls.color.palette"
 msgstr "Palette di colori"
 
-#: app/configurator/components/chart-controls/color-ramp.tsx:147
+#: app/configurator/components/chart-controls/color-ramp.tsx:146
 msgid "controls.color.palette.diverging"
 msgstr "Divergente"
 
-#: app/configurator/components/chart-controls/color-palette.tsx:257
-#: app/configurator/components/chart-controls/color-palette.tsx:263
+#: app/configurator/components/chart-controls/color-palette.tsx:237
+#: app/configurator/components/chart-controls/color-palette.tsx:243
 msgid "controls.color.palette.reset"
 msgstr "Ripristina la tavolozza dei colori"
 
-#: app/configurator/components/chart-controls/color-ramp.tsx:161
+#: app/configurator/components/chart-controls/color-ramp.tsx:159
 msgid "controls.color.palette.sequential"
 msgstr "Sequenziale"
 
@@ -361,18 +365,18 @@ msgid "controls.imputation"
 msgstr "Tipo di imputazione"
 
 #: app/configurator/components/chart-options-selector.tsx:490
-#: app/configurator/components/ui-helpers.ts:465
+#: app/configurator/components/ui-helpers.ts:473
 msgid "controls.imputation.type.linear"
 msgstr "Interpolazione lineare"
 
 #: app/configurator/components/chart-options-selector.tsx:483
 #: app/configurator/components/chart-options-selector.tsx:495
-#: app/configurator/components/ui-helpers.ts:457
+#: app/configurator/components/ui-helpers.ts:465
 msgid "controls.imputation.type.none"
 msgstr "-"
 
 #: app/configurator/components/chart-options-selector.tsx:485
-#: app/configurator/components/ui-helpers.ts:461
+#: app/configurator/components/ui-helpers.ts:469
 msgid "controls.imputation.type.zeros"
 msgstr "Zeri"
 
@@ -441,15 +445,15 @@ msgstr "Inattivo"
 msgid "controls.search.clear"
 msgstr "Cancella la ricerca"
 
-#: app/configurator/map/map-chart-options.tsx:158
+#: app/configurator/map/map-chart-options.tsx:162
 msgid "controls.section.areaLayer"
 msgstr ""
 
-#: app/configurator/map/map-chart-options.tsx:64
+#: app/configurator/map/map-chart-options.tsx:59
 msgid "controls.section.baseLayer"
 msgstr ""
 
-#: app/configurator/components/chart-configurator.tsx:258
+#: app/configurator/components/chart-configurator.tsx:262
 msgid "controls.section.chart.options"
 msgstr "Opzioni del grafico"
 
@@ -461,7 +465,7 @@ msgstr "Colonne"
 msgid "controls.section.columnstyle"
 msgstr "Stile della colonna"
 
-#: app/configurator/components/chart-configurator.tsx:273
+#: app/configurator/components/chart-configurator.tsx:277
 msgid "controls.section.data.filters"
 msgstr "Filtri"
 
@@ -498,11 +502,16 @@ msgstr "Filtri interattivi"
 msgid "controls.section.interactiveFilters.dataFilters"
 msgstr "Filtri di dati"
 
+#: app/configurator/map/map-chart-options.tsx:154
+#: app/configurator/map/map-chart-options.tsx:341
+msgid "controls.section.map.noGeoDimensions"
+msgstr "In questo set di dati non ci sono dimensioni geografiche da mostrare!"
+
 #: app/configurator/components/chart-options-selector.tsx:411
 msgid "controls.section.sorting"
 msgstr "Ordina"
 
-#: app/configurator/map/map-chart-options.tsx:329
+#: app/configurator/map/map-chart-options.tsx:349
 msgid "controls.section.symbolLayer"
 msgstr ""
 
@@ -745,11 +754,11 @@ msgstr ""
 msgid "datatable.showing.first.rows"
 msgstr "Sono mostrate soltanto le prime 10 righe"
 
-#: app/configurator/map/map-chart-options.tsx:162
+#: app/configurator/map/map-chart-options.tsx:166
 msgid "fields.areaLayer.show"
 msgstr ""
 
-#: app/configurator/map/map-chart-options.tsx:333
+#: app/configurator/map/map-chart-options.tsx:353
 msgid "fields.symbolLayer.show"
 msgstr ""
 
@@ -761,11 +770,11 @@ msgstr "Ufficio federale dell'ambiente UFAM"
 msgid "footer.institution.url"
 msgstr "https://www.bafu.admin.ch/bafu/it/home.html"
 
-#: app/components/hint.tsx:197
+#: app/components/hint.tsx:199
 msgid "hint.chartunexpected.message"
 msgstr ""
 
-#: app/components/hint.tsx:194
+#: app/components/hint.tsx:196
 msgid "hint.chartunexpected.title"
 msgstr ""
 
@@ -773,11 +782,11 @@ msgstr ""
 msgid "hint.create.your.own.chart"
 msgstr "Crea la tua versione di questa visualizzazione copiandola, oppure inizia da zero e crea una nuova visualizzazione utilizzando i dati aperti dell’amministrazione pubblica svizzera."
 
-#: app/components/hint.tsx:171
+#: app/components/hint.tsx:173
 msgid "hint.dataloadingerror.message"
 msgstr "I dati non possono essere caricati."
 
-#: app/components/hint.tsx:168
+#: app/components/hint.tsx:170
 msgid "hint.dataloadingerror.title"
 msgstr "Problema di caricamento dei dati"
 
@@ -793,7 +802,7 @@ msgstr "Caricamento dei dati..."
 msgid "hint.no.visualization.with.dataset"
 msgstr "Nessuna visualizzazione può essere creata con il dataset selezionato."
 
-#: app/components/hint.tsx:146
+#: app/components/hint.tsx:148
 msgid "hint.nodata.message"
 msgstr "Prova con un'altra combinazione di filtri."
 
@@ -801,15 +810,15 @@ msgstr "Prova con un'altra combinazione di filtri."
 msgid "hint.nodata.title"
 msgstr "Non ci sono dati corrispondenti ai filtri selezionati"
 
-#: app/components/hint.tsx:223
+#: app/components/hint.tsx:225
 msgid "hint.only.negative.data.message"
 msgstr "Dati con valori negativi non possono essere visualizzati con questo tipo di grafico."
 
-#: app/components/hint.tsx:220
+#: app/components/hint.tsx:222
 msgid "hint.only.negative.data.title"
 msgstr "Valori negativi"
 
-#: app/components/hint.tsx:248
+#: app/components/hint.tsx:250
 msgid "hint.publication.success"
 msgstr "La tua visualizzazione è ora pubblicata. Condividila copiando l'URL o utilizzando le opzioni di incorporamento."