Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenThematicalMapViewCommand.cs
===================================================================
diff -u -r40f7e8ca93f206b5b80d9dfb66fc73628789053c -r5664f1bdab4e8042daab1d05754d797073d22de2
--- Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenThematicalMapViewCommand.cs	(.../OpenThematicalMapViewCommand.cs)	(revision 40f7e8ca93f206b5b80d9dfb66fc73628789053c)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenThematicalMapViewCommand.cs	(.../OpenThematicalMapViewCommand.cs)	(revision 5664f1bdab4e8042daab1d05754d797073d22de2)
@@ -41,6 +41,7 @@
     public class OpenThematicalMapViewCommand : ICommand
     {
         private readonly IViewCommands viewCommands;
+        private const string selectedMetaDataAttributeName = "Waarde";
 
         /// <summary>
         /// Creates a new instance of <see cref="OpenThematicalMapViewCommand"/>.
@@ -63,7 +64,8 @@
                 Style =
                 {
                     Size = 10
-                }
+                },
+                SelectedMetaDataAttribute = selectedMetaDataAttributeName
             };
             SetEqualCriteria(mapPointDataEqualCriteria);
             mapDataCollection.Add(mapPointDataEqualCriteria);
@@ -74,35 +76,40 @@
                 Style =
                 {
                     Size = 10
-                }
+                },
+                SelectedMetaDataAttribute = selectedMetaDataAttributeName
             };
             SetUnequalCriteria(mapPointDataUnequalCriteria);
             mapDataCollection.Add(mapPointDataUnequalCriteria);
 
             var mapLineDataEqualCriteria = new MapLineData(Resources.OpenThematicalMapViewCommand_Execute_MapLineData_with_EqualValueCriteria)
             {
-                Features = CreateMapLineFeaturesWithMetaData(40)
+                Features = CreateMapLineFeaturesWithMetaData(40),
+                SelectedMetaDataAttribute = selectedMetaDataAttributeName
             };
             SetEqualCriteria(mapLineDataEqualCriteria);
             mapDataCollection.Add(mapLineDataEqualCriteria);
 
             var mapLineDataUnequalCriteria = new MapLineData(Resources.OpenThematicalMapViewCommand_Execute_MapLineData_with_UnequalValueCriteria)
             {
-                Features = CreateMapLineFeaturesWithMetaData(10)
+                Features = CreateMapLineFeaturesWithMetaData(10),
+                SelectedMetaDataAttribute = selectedMetaDataAttributeName
             };
             SetUnequalCriteria(mapLineDataUnequalCriteria);
             mapDataCollection.Add(mapLineDataUnequalCriteria);
 
             var mapPolygonDataEqualCriteria = new MapPolygonData(Resources.OpenThematicalMapViewCommand_Execute_MapPolygonData_with_EqualValueCriteria)
             {
-                Features = CreatePolygonFeaturesWithMetaData(40)
+                Features = CreatePolygonFeaturesWithMetaData(40),
+                SelectedMetaDataAttribute = selectedMetaDataAttributeName
             };
             SetEqualCriteria(mapPolygonDataEqualCriteria);
             mapDataCollection.Add(mapPolygonDataEqualCriteria);
 
             var mapPolygonDataUnequalCriteria = new MapPolygonData(Resources.OpenThematicalMapViewCommand_Execute_MapPolygonData_with_UnequalValueCriteria)
             {
-                Features = CreatePolygonFeaturesWithMetaData(10)
+                Features = CreatePolygonFeaturesWithMetaData(10),
+                SelectedMetaDataAttribute = selectedMetaDataAttributeName
             };
             SetUnequalCriteria(mapPolygonDataUnequalCriteria);
             mapDataCollection.Add(mapPolygonDataUnequalCriteria);
@@ -150,7 +157,7 @@
                 {
                     new Point2D(xCoordinate, 0)
                 });
-                feature.MetaData["Waarde"] = i;
+                feature.MetaData[selectedMetaDataAttributeName] = i;
                 features[i] = feature;
 
                 xCoordinate += offset;
@@ -172,7 +179,7 @@
                     new Point2D(xCoordinate, 0),
                     new Point2D(xCoordinate++, 10)
                 });
-                feature.MetaData["Waarde"] = i;
+                feature.MetaData[selectedMetaDataAttributeName] = i;
                 features[i] = feature;
             }
 
@@ -197,7 +204,7 @@
                     new Point2D(rightCoordinate, 0),
                     new Point2D(leftCoordinate, 0)
                 });
-                feature.MetaData["Waarde"] = i;
+                feature.MetaData[selectedMetaDataAttributeName] = i;
                 features[i] = feature;
 
                 leftCoordinate += offset;
Index: Demo/Ringtoets/src/Demo.Ringtoets/Properties/Resources.Designer.cs
===================================================================
diff -u -r4f5c5afab904ec8570bb482a9845b56f074a26e4 -r5664f1bdab4e8042daab1d05754d797073d22de2
--- Demo/Ringtoets/src/Demo.Ringtoets/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 4f5c5afab904ec8570bb482a9845b56f074a26e4)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 5664f1bdab4e8042daab1d05754d797073d22de2)
@@ -195,7 +195,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Thematische Kaart.
+        ///   Looks up a localized string similar to Thematische kaart.
         /// </summary>
         public static string General_ThematicMap {
             get {
Index: Demo/Ringtoets/src/Demo.Ringtoets/Properties/Resources.resx
===================================================================
diff -u -r4f5c5afab904ec8570bb482a9845b56f074a26e4 -r5664f1bdab4e8042daab1d05754d797073d22de2
--- Demo/Ringtoets/src/Demo.Ringtoets/Properties/Resources.resx	(.../Resources.resx)	(revision 4f5c5afab904ec8570bb482a9845b56f074a26e4)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Properties/Resources.resx	(.../Resources.resx)	(revision 5664f1bdab4e8042daab1d05754d797073d22de2)
@@ -218,7 +218,7 @@
     <value>..\Resources\chart_organisation.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="General_ThematicMap" xml:space="preserve">
-    <value>Thematische Kaart</value>
+    <value>Thematische kaart</value>
   </data>
   <data name="OpenThematicalMapViewCommand_Execute_Demo_map_with_theming" xml:space="preserve">
     <value>Demo kaart categorial theming</value>