--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixReferenceEventsFacet.java	Thu Aug 16 15:47:10 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixReferenceEventsFacet.java	Thu Aug 16 16:27:53 2018 +0200
@@ -8,6 +8,7 @@
 
 package org.dive4elements.river.artifacts.model.fixings;
 
+import org.apache.commons.lang.math.DoubleRange;
 import org.apache.log4j.Logger;
 import org.dive4elements.artifacts.Artifact;
 import org.dive4elements.artifacts.CallContext;
@@ -15,24 +16,29 @@
 import org.dive4elements.river.artifacts.model.CalculationResult;
 import org.dive4elements.river.artifacts.model.FacetTypes;
 import org.dive4elements.river.artifacts.states.DefaultState.ComputeType;
-import org.dive4elements.river.utils.KMIndex;
 
 /**
  * Facet to show W values for Q values at km for a date.
  *
  * @author <a href="mailto:raimund.renkert@intevation.de">Raimund Renkert</a>
  */
-public class FixReferenceEventsFacet extends FixingsFacet implements FacetTypes {
+public class FixReferenceEventsFacet extends FixingsEventFacet implements FacetTypes {
+
+    private static final long serialVersionUID = 1L;
 
     /** House log. */
     private static Logger log = Logger.getLogger(FixReferenceEventsFacet.class);
 
+    private int columnId;
+
     /** Trivial Constructor. */
     public FixReferenceEventsFacet() {
     }
 
-    public FixReferenceEventsFacet(final int index, final String name, final String description) {
-        super(index, name, description, ComputeType.ADVANCE, null, null);
+    public FixReferenceEventsFacet(final int facetIndex, final int columnId, final String name, final String description, final DoubleRange stationRange) {
+        super(facetIndex, name, description, ComputeType.ADVANCE, null, null, stationRange);
+
+        this.columnId = columnId;
     }
 
     /**
@@ -64,23 +70,14 @@
         if (log.isDebugEnabled())
             log.debug("current km in FRE: " + currentKm);
 
-        /* first search in referenced */
-        final KMIndex<QWD[]> referenced = result.getFixings();
-        return find(referenced, currentKm);
-    }
-
-    private QWD find(final KMIndex<QWD[]> kmQWs, final double currentKm) {
-
-        final KMIndex.Entry<QWD[]> kmQWsEntry = kmQWs.binarySearch(currentKm);
-        if (kmQWsEntry != null) {
-            final int ndx = this.index & 255;
-            for (final QWD qwd : kmQWsEntry.getValue()) {
-                if (qwd.getIndex() == ndx)
-                    return qwd;
-            }
+        final FixResultColumns resultColumns = result.getFixResultColumns();
+        final FixResultColumn event = resultColumns.getColumn(this.columnId);
+        if (event == null) {
+            log.error("Missing event with columnId: " + this.columnId);
+            return null;
         }
 
-        return null;
+        return event.getQWD(currentKm);
     }
 
     /**
@@ -92,6 +89,7 @@
     public FixReferenceEventsFacet deepCopy() {
         final FixReferenceEventsFacet copy = new FixReferenceEventsFacet();
         copy.set(this);
+        copy.columnId = this.columnId;
         return copy;
     }
 }
\ No newline at end of file