--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionState.java	Mon Jul 02 17:40:39 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionState.java	Mon Jul 02 19:01:09 2018 +0200
@@ -78,17 +78,18 @@
 
         /* add themes for chart, for each result */
         final List<AbstractCalculationExportableResult> resultList = results.getResults();
-        int j = -1;
+        int themeCount = 0;
         for (int index = 0; index < resultList.size(); index++) {
             if (resultList.get(index) instanceof CollisionCalcOverviewResult) {
                 final CollisionCalcOverviewResult result = (CollisionCalcOverviewResult) resultList.get(index);
-                if (result.getSingleYears() == null)
-                    facets.add(CollisionCalcProcessor.createFacet(context, hash, this.id, result, index));
+
+                final int[] singleYears = result.getSingleYears();
+
+                if (singleYears == null)
+                    facets.add(CollisionCalcProcessor.createFacet(context, hash, this.id, result, index, -1, themeCount++));
                 else {
-                    for (int i = 0; i <= result.getSingleYears().length - 1; i++) {
-                        j++;
-                        facets.add(CollisionCalcProcessor.createFacet(context, hash, this.id, result, j));
-                    }
+                    for (final int singleYear : singleYears)
+                        facets.add(CollisionCalcProcessor.createFacet(context, hash, this.id, result, index, singleYear, themeCount++));
                 }
             }
         }