diff --git a/pom.xml b/pom.xml
index 9150c824be067135cca98e67f1c54f06a4d69af6..e5a87eacb735faadb87aad515b21bc8320a8277f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 		<timestamp>${maven.build.timestamp}</timestamp>
 		<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<currentLuceneVersion>8.0.0</currentLuceneVersion>
+		<currentLuceneVersion>8.1.1</currentLuceneVersion>
 	</properties>
 	<scm>
     <connection>scm:git:git@github.com:textexploration/mtas.git</connection>
@@ -24,7 +24,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.textexploration.mtas</groupId>
 	<artifactId>mtas</artifactId>
-	<version>8.0.0.1-SNAPSHOT</version>
+	<version>8.1.1.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<licenses>
 		<license>
diff --git a/src/main/java/mtas/codec/util/CodecComponent.java b/src/main/java/mtas/codec/util/CodecComponent.java
index 057e910ff07c8a9947202437b8daa8061a9ef33d..43183e8f9928fc97a6a69e5dff8d73d75791a925 100644
--- a/src/main/java/mtas/codec/util/CodecComponent.java
+++ b/src/main/java/mtas/codec/util/CodecComponent.java
@@ -30,6 +30,8 @@ import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 import mtas.analysis.token.MtasToken;
 import mtas.analysis.token.MtasTokenString;
@@ -1405,6 +1407,7 @@ public class CodecComponent {
           String[] subBaseSortDirections = Arrays.copyOfRange(baseSortDirections, 1, baseSortDirections.length);
           Integer[] subNumbers = Arrays.copyOfRange(baseNumbers, 1, baseNumbers.length);
           Integer[] subStarts = ArrayUtils.toObject(new int[subNumbers.length]);
+          
           dataCollector = DataCollector.getCollector(this.baseCollectorTypes[0], this.baseDataTypes[0],
               this.baseStatsTypes[0], this.baseStatsItems[0], this.baseSortTypes[0], this.baseSortDirections[0], 0,
               this.baseNumbers[0], subBaseCollectorTypes, subBaseDataTypes, subBaseStatsTypes, subBaseStatsItems,