--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/FixWQProcessor.java	Wed Aug 01 13:21:34 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/FixWQProcessor.java	Wed Aug 01 17:13:52 2018 +0200
@@ -26,7 +26,6 @@
 import org.dive4elements.river.artifacts.model.fixings.FixFunction;
 import org.dive4elements.river.artifacts.model.fixings.FixWQCurveFacet;
 import org.dive4elements.river.artifacts.model.fixings.QWD;
-import org.dive4elements.river.artifacts.model.fixings.QWI;
 import org.dive4elements.river.artifacts.resources.Resources;
 import org.dive4elements.river.exports.DiagramGenerator;
 import org.dive4elements.river.exports.StyledSeriesBuilder;
@@ -51,12 +50,10 @@
 extends DefaultProcessor
 implements FacetTypes
 {
-
     private static Logger log = Logger.getLogger(FixWQProcessor.class);
 
     private String I18N_AXIS_LABEL = "chart.discharge.curve.yaxis.label";
 
-
     public FixWQProcessor() {
     }
 
@@ -83,9 +80,6 @@
         else if(FIX_WQ_CURVE.equals(facetType)) {
             doWQCurveOut(generator, bundle, theme, visible);
         }
-        else if(FIX_OUTLIER.equals(facetType)) {
-            doOutlierOut(generator, bundle, theme, visible);
-        }
         else if(QSECTOR.equals(facetType)) {
             doQSectorOut(generator, bundle, theme, visible);
         }
@@ -103,7 +97,7 @@
     }
 
     /** Add sector average points to chart. */
-    protected void doSectorAverageOut(
+    private void doSectorAverageOut(
         DiagramGenerator generator,
         ArtifactAndFacet bundle,
         ThemeDocument theme,
@@ -146,7 +140,7 @@
 
 
     /** Add analysis event points to chart. */
-    protected void doEventsOut(
+    private void doEventsOut(
         DiagramGenerator generator,
         ArtifactAndFacet bundle,
         ThemeDocument    theme,
@@ -163,7 +157,7 @@
 
         // prevent potential side effects
         final ThemeDocument themeInterpolated = FixWQCurveGenerator.configureThemeInterpolated(theme, qwd);
-        final XYSeries series = FixWQCurveGenerator.createQWDSeries(bundle, themeInterpolated, qwd);
+        final XYSeries series = FixWQCurveGenerator.createQWDSeries(generator.getContext().getMeta(), bundle, themeInterpolated, qwd);
 
         generator.addAxisSeries(series, axisName, visible);
 
@@ -185,46 +179,7 @@
         }
     }
 
-    /** Add reference event points to chart. */
-    protected void doReferenceEventsOut(
-        DiagramGenerator generator,
-        ArtifactAndFacet bundle,
-        ThemeDocument theme,
-        boolean visible) {
-        log.debug("doReferenceEventsOut");
-
-        QWI qwd = (QWI)bundle.getData(generator.getContext());
-        if (qwd == null) {
-            log.debug("doReferenceEventsOut: qwds == null in "
-                + bundle.getFacetDescription());
-            return;
-        }
-
-        
-        final ThemeDocument themeInterpolated = FixWQCurveGenerator.configureThemeInterpolated(theme, qwd);
-        final XYSeries series = FixWQCurveGenerator.createQWDSeries(bundle, themeInterpolated, qwd);
-        series.add(qwd.getQ(), qwd.getW(), false);
-
-        if (visible && themeInterpolated.parseShowPointLabel()) {
-            DateFormat dateFormat = DateFormat.getDateInstance(
-                DateFormat.SHORT);
-
-            XYTextAnnotation anno = new CollisionFreeXYTextAnnotation(
-                dateFormat.format(qwd.getDate()),
-                qwd.getQ(),
-                qwd.getW());
-
-            List<XYTextAnnotation> textAnnos = new ArrayList<>();
-            textAnnos.add(anno);
-            RiverAnnotation flysAnno = new RiverAnnotation(null, null, null, themeInterpolated);
-            flysAnno.setTextAnnotations(textAnnos);
-            generator.addAnnotations(flysAnno);
-        }
-
-        generator.addAxisSeries(series, axisName, visible);
-    }
-
-    protected void doWQCurveOut(
+    private void doWQCurveOut(
         DiagramGenerator generator,
         ArtifactAndFacet bundle,
         ThemeDocument theme,
@@ -259,48 +214,6 @@
         }
     }
 
-    protected void doOutlierOut(
-        DiagramGenerator generator,
-        ArtifactAndFacet bundle,
-        ThemeDocument theme,
-        boolean visible
-    ) {
-        log.debug("doOutlierOut");
-
-        QWI[] qws = (QWI[])bundle.getData(generator.getContext());
-        if(qws != null) {
-            XYSeries series = new StyledXYSeries(
-                bundle.getFacetDescription(),
-                false, true,
-                theme);
-            DateFormat dateFormat = DateFormat.getDateInstance(
-                DateFormat.SHORT);
-
-            List<XYTextAnnotation> annos = new ArrayList<>();
-
-            for (QWI qw: qws) {
-                series.add(qw.getQ(), qw.getW(), false);
-
-                XYTextAnnotation anno = new CollisionFreeXYTextAnnotation(
-                        dateFormat.format(qw.getDate()),
-                        qw.getQ(),
-                        qw.getW());
-                annos.add(anno);
-            }
-            generator.addAxisSeries(series, axisName, visible);
-
-            if (visible && theme != null && theme.parseShowPointLabel()) {
-                RiverAnnotation flysAnno =
-                        new RiverAnnotation(null, null, null, theme);
-                flysAnno.setTextAnnotations(annos);
-                generator.addAnnotations(flysAnno);
-            }
-        }
-        else {
-            log.debug("doOutlierOut: qwd == null");
-        }
-    }
-
     /** Add markers for q sectors. */
     protected void doQSectorOut(
         DiagramGenerator generator,
@@ -487,7 +400,6 @@
             || FIX_REFERENCE_EVENTS_WQ.equals(facettype)
             || FIX_EVENTS.equals(facettype)
             || FIX_WQ_CURVE.equals(facettype)
-            || FIX_OUTLIER.equals(facettype)
             || QSECTOR.equals(facettype)
             || STATIC_WKMS_MARKS.equals(facettype)
             || STATIC_WKMS.equals(facettype)