--- a/artifacts/src/main/java/org/dive4elements/river/exports/HistoricalDischargeCurveGenerator.java	Tue Jun 05 19:10:38 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/HistoricalDischargeCurveGenerator.java	Tue Jun 05 19:21:16 2018 +0200
@@ -13,7 +13,7 @@
 import org.apache.log4j.Logger;
 
 import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
-
+import org.dive4elements.artifacts.CallContext;
 import org.dive4elements.river.artifacts.D4EArtifact;
 
 import org.dive4elements.river.artifacts.access.HistoricalDischargeAccess;
@@ -90,13 +90,13 @@
     }
 
     @Override
-    protected String getDefaultChartTitle() {
+    protected String getDefaultChartTitle(final CallContext context) {
         return msg(I18N_CHART_TITLE, I18N_CHART_TITLE);
     }
 
     @Override
-    protected String getDefaultChartSubtitle() {
-        D4EArtifact flys = (D4EArtifact) master;
+    protected String getDefaultChartSubtitle(final CallContext context) {
+        D4EArtifact flys = getArtifact();
         Timerange evalTime = new HistoricalDischargeAccess(flys)
             .getEvaluationTimerange();
 
@@ -107,7 +107,7 @@
     }
 
     @Override
-    protected String getDefaultXAxisLabel() {
+    protected String getDefaultXAxisLabel(final CallContext context) {
         return msg(I18N_XAXIS_LABEL, I18N_XAXIS_LABEL);
     }
 
@@ -138,6 +138,8 @@
         log.debug("Theme description is: "
             + artifactFacet.getFacetDescription());
 
+        final CallContext context = getContext();
+        
         if (name.equals(HISTORICAL_DISCHARGE_Q)) {
             doHistoricalDischargeOutQ(
                 (D4EArtifact) artifactFacet.getArtifact(),