diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/TrackedRaceWithContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/TrackedRaceWithContext.java
index 95cea419c44..4e863bb6089 100644
--- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/TrackedRaceWithContext.java
+++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/TrackedRaceWithContext.java
@@ -50,7 +50,7 @@ public class TrackedRaceWithContext implements HasTrackedRaceContext {
     
     @Override
     public TrackedRace getTrackedRace() {
-        return getTrackedRace();
+        return trackedRace;
     }
 
     @Override
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
index 651cdf04a45..5c01e6e98af 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
@@ -1038,4 +1038,5 @@ public interface StringMessages extends Messages {
     String imageURLs();
     String videoURLs();
     String manage2SailFinalNotice();
+    String invalidSelection();
 }
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
index 0dd3e05dbfb..c2dda642b1f 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
@@ -1023,4 +1023,5 @@ withNamePrefix=with name prefix
 pleaseSelectASeriesFirst=Please select a series first.
 imageURLs=Image URLs
 videoURLs=Video URLs
-manage2SailFinalNotice=For Manage2Sail XRR please note:\nAs long as the final flag is not set for the Regatta in the json\nDocument, the regatta results will not be shown in the list.
\ No newline at end of file
+manage2SailFinalNotice=For Manage2Sail XRR please note:\nAs long as the final flag is not set for the Regatta in the json\nDocument, the regatta results will not be shown in the list.
+invalidSelection=The current selection isn''t valid.
\ No newline at end of file
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
index 81c06969756..a49008bf421 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
@@ -1017,4 +1017,5 @@ withNamePrefix=mit Namenspräfix
 pleaseSelectASeriesFirst=Bitte zuerst eine Serie auswählen.
 imageURLs=Bilder-URLs
 videoURLs=Video-URLs
-manage2SailFinalNotice=Für Manage2Sail XRR bitte beachten:\nSolange das final flag für die Regatta im JSON Dokument noch nicht\ngesetzt ist, werden keine entsprechenden Ergebnisse angezeigt.  
\ No newline at end of file
+manage2SailFinalNotice=Für Manage2Sail XRR bitte beachten:\nSolange das final flag für die Regatta im JSON Dokument noch nicht\ngesetzt ist, werden keine entsprechenden Ergebnisse angezeigt.  
+invalidSelection=Die aktuelle Selektion ist nicht gültig.
\ No newline at end of file
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/client/presentation/ResultsChart.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/client/presentation/ResultsChart.java
index 2456e2d730c..164e8e1a3d0 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/client/presentation/ResultsChart.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/client/presentation/ResultsChart.java
@@ -36,7 +36,7 @@ public class ResultsChart implements ResultsPresenter<Number> {
     private StringMessages stringMessages;
     private SimplePanel mainPanel;
 
-//    private Chart chart;
+    private Chart chart;
     private Map<GroupKey, Series> series;
 
     private Map<GroupKey, Integer> mainKeyToValueMap;
@@ -50,16 +50,16 @@ public class ResultsChart implements ResultsPresenter<Number> {
         mainPanel = new ResizingSimplePanel() {
             @Override
             public void onResize() {
-//                chart.setSizeToMatchContainer();
-//                chart.redraw();
+                chart.setSizeToMatchContainer();
+                chart.redraw();
             }
         };
         series = new HashMap<GroupKey, Series>();
         errorLabel = new HTML();
         errorLabel.setStyleName("chart-importantMessage");
 
-//        createChart();
-//        mainPanel.setWidget(chart);
+        createChart();
+        showError(this.stringMessages.invalidSelection());
     }
     
     @Override
@@ -80,30 +80,30 @@ public class ResultsChart implements ResultsPresenter<Number> {
 
     @Override
     public void showResult(QueryResult<Number> result) {
-//        if (!result.isEmpty()) {
-//            resetChart();
-//            
-//            updateYAxisLabels(result);
-//            updateChartSubtitleAndSetChartAsWidget(result);
-//            
-//            List<GroupKey> sortedKeys = getSortedKeysFrom(result);
-//            buildGroupKeyValueMaps(sortedKeys);
-//            if (resultHasComplexKeys(result)) {
-//                displayComplexResult(result, sortedKeys);
-//            } else {
-//                displaySimpleResult(result, sortedKeys);
-//            }
-//            
-//            chart.redraw();
-//        } else {
-//            showError(stringMessages.noDataFound() + ".");
-//        }
+        if (!result.isEmpty()) {
+            resetChart();
+            
+            updateYAxisLabels(result);
+            updateChartSubtitleAndSetChartAsWidget(result);
+            
+            List<GroupKey> sortedKeys = getSortedKeysFrom(result);
+            buildGroupKeyValueMaps(sortedKeys);
+            if (resultHasComplexKeys(result)) {
+                displayComplexResult(result, sortedKeys);
+            } else {
+                displaySimpleResult(result, sortedKeys);
+            }
+            
+            chart.redraw();
+        } else {
+            showError(stringMessages.noDataFound() + ".");
+        }
     }
 
     private void updateYAxisLabels(QueryResult<? extends Number> result) {
-//        chart.getYAxis().setAxisTitleText(result.getResultSignifier());
-//        chart.setToolTip(new ToolTip().setValueDecimals(result.getValueDecimals()).setValueSuffix(
-//                UnitFormatter.format(result.getUnit())));
+        chart.getYAxis().setAxisTitleText(result.getResultSignifier());
+        chart.setToolTip(new ToolTip().setValueDecimals(result.getValueDecimals()).setValueSuffix(
+                UnitFormatter.format(result.getUnit())));
     }
 
     private boolean resultHasComplexKeys(QueryResult<? extends Number> result) {
@@ -116,35 +116,34 @@ public class ResultsChart implements ResultsPresenter<Number> {
     }
 
     private void displayComplexResult(QueryResult<? extends Number> result, List<GroupKey> sortedKeys) {
-//        Map<Series, Boolean> isInChart = new HashMap<Series, Boolean>();
-//        for (GroupKey key : sortedKeys) {
-//            Point point = new Point(mainKeyToValueMap.get(key.getMainKey()), result.getResults().get(key));
-//            point.setName(key.getMainKey().asString());
-//            Series series = getOrCreateSeries(key).addPoint(point, false, false, false);
-//            if (isInChart.get(series) == null || !isInChart.get(series)) {
-//                chart.addSeries(series, false, false);
-//                isInChart.put(series, true);
-//            }
-//        }
+        Map<Series, Boolean> isInChart = new HashMap<Series, Boolean>();
+        for (GroupKey key : sortedKeys) {
+            Point point = new Point(mainKeyToValueMap.get(key.getMainKey()), result.getResults().get(key));
+            point.setName(key.getMainKey().asString());
+            Series series = getOrCreateSeries(key).addPoint(point, false, false, false);
+            if (isInChart.get(series) == null || !isInChart.get(series)) {
+                chart.addSeries(series, false, false);
+                isInChart.put(series, true);
+            }
+        }
     }
 
     private void displaySimpleResult(QueryResult<? extends Number> result, List<GroupKey> sortedKeys) {
-//        Series series = chart.createSeries().setName("Results");
-//        for (GroupKey key : sortedKeys) {
-//            Point point = new Point(mainKeyToValueMap.get(key.getMainKey()), result.getResults().get(key));
-//            point.setName(key.getMainKey().asString());
-//            series.addPoint(point, false, false, false);
-//        }
-//        chart.addSeries(series, false, false);
+        Series series = chart.createSeries().setName("Results");
+        for (GroupKey key : sortedKeys) {
+            Point point = new Point(mainKeyToValueMap.get(key.getMainKey()), result.getResults().get(key));
+            point.setName(key.getMainKey().asString());
+            series.addPoint(point, false, false, false);
+        }
+        chart.addSeries(series, false, false);
     }
 
     private void updateChartSubtitleAndSetChartAsWidget(QueryResult<? extends Number> result) {
-//        chart.setChartSubtitle(new ChartSubtitle().setText(stringMessages.queryResultsChartSubtitle(
-//                result.getRetrievedDataAmount(), result.getFilteredDataAmount(), result.getCalculationTimeInSeconds())));
-//        // This is needed, so that the subtitle is updated. Otherwise the text would stay empty
-//        mainPanel.setWidget(null);
-//        mainPanel.setWidget(chart);
-
+        chart.setChartSubtitle(new ChartSubtitle().setText(stringMessages.queryResultsChartSubtitle(
+                result.getRetrievedDataAmount(), result.getFilteredDataAmount(), result.getCalculationTimeInSeconds())));
+        // This is needed, so that the subtitle is updated. Otherwise the text would stay empty
+        mainPanel.setWidget(null);
+        mainPanel.setWidget(chart);
     }
 
     public List<GroupKey> getSortedKeysFrom(QueryResult<? extends Number> result) {
@@ -171,54 +170,54 @@ public class ResultsChart implements ResultsPresenter<Number> {
         }
     }
 
-//    private Series getOrCreateSeries(GroupKey groupKey) {
-//        GroupKey key = groupKey.hasSubKey() ? groupKey.getSubKey() : groupKey;
-//
-//        if (!series.containsKey(key)) {
-//            series.put(key, chart.createSeries().setName(key.asString()));
-//        }
-//        return series.get(key);
-//    }
+    private Series getOrCreateSeries(GroupKey groupKey) {
+        GroupKey key = groupKey.hasSubKey() ? groupKey.getSubKey() : groupKey;
+
+        if (!series.containsKey(key)) {
+            series.put(key, chart.createSeries().setName(key.asString()));
+        }
+        return series.get(key);
+    }
 
     private void resetChart() {
-//        chart.removeAllSeries(false);
-//        series = new HashMap<GroupKey, Series>();
+        chart.removeAllSeries(false);
+        series = new HashMap<GroupKey, Series>();
     }
 
     private void createChart() {
-//        chart = new Chart()
-//                .setType(Series.Type.COLUMN)
-//                .setMarginLeft(100)
-//                .setMarginRight(45)
-//                .setWidth100()
-//                .setHeight100()
-//                .setBorderColor(new Color("#F0AB00"))
-//                .setPlotBorderWidth(0)
-//                .setCredits(new Credits().setEnabled(false))
-//                .setChartTitle(new ChartTitle().setText(stringMessages.dataMiningResult()));
-//
-//        chart.getXAxis().setAllowDecimals(false).setLabels(new XAxisLabels().setFormatter(new AxisLabelsFormatter() {
-//            @Override
-//            public String format(AxisLabelsData axisLabelsData) {
-//                try {
-//                    Integer value = (int) axisLabelsData.getValueAsDouble();
-//                    return valueToGroupKeyMap.get(value).asString();
-//                } catch (Exception e) {
-//                    return "error formatting label";
-//                }
-//            }
-//        }));
-//
-//        chart.getYAxis().setAxisTitleText("Result").setLabels(new YAxisLabels().setFormatter(new AxisLabelsFormatter() {
-//            @Override
-//            public String format(AxisLabelsData axisLabelsData) {
-//                try {
-//                    return axisLabelsData.getValueAsDouble() + "";
-//                } catch (Exception e) {
-//                    return "";
-//                }
-//            }
-//        }));
+        chart = new Chart()
+                .setType(Series.Type.COLUMN)
+                .setMarginLeft(100)
+                .setMarginRight(45)
+                .setWidth100()
+                .setHeight100()
+                .setBorderColor(new Color("#F0AB00"))
+                .setPlotBorderWidth(0)
+                .setCredits(new Credits().setEnabled(false))
+                .setChartTitle(new ChartTitle().setText(stringMessages.dataMiningResult()));
+
+        chart.getXAxis().setAllowDecimals(false).setLabels(new XAxisLabels().setFormatter(new AxisLabelsFormatter() {
+            @Override
+            public String format(AxisLabelsData axisLabelsData) {
+                try {
+                    Integer value = (int) axisLabelsData.getValueAsDouble();
+                    return valueToGroupKeyMap.get(value).asString();
+                } catch (Exception e) {
+                    return "error formatting label";
+                }
+            }
+        }));
+
+        chart.getYAxis().setAxisTitleText("Result").setLabels(new YAxisLabels().setFormatter(new AxisLabelsFormatter() {
+            @Override
+            public String format(AxisLabelsData axisLabelsData) {
+                try {
+                    return axisLabelsData.getValueAsDouble() + "";
+                } catch (Exception e) {
+                    return "";
+                }
+            }
+        }));
     }
     
     @Override