diff --git a/src/main/java/de/ids_mannheim/korap/KorapIndex.java b/src/main/java/de/ids_mannheim/korap/KorapIndex.java
index c145e38..518bd36 100644
--- a/src/main/java/de/ids_mannheim/korap/KorapIndex.java
+++ b/src/main/java/de/ids_mannheim/korap/KorapIndex.java
@@ -1103,11 +1103,15 @@
 	try {
 
 	    // Rewrite query (for regex and wildcard queries)
+	    // Revise!
+	    // Based on core/src/java/org/apache/lucene/search/IndexSearcher.java
+	    // and highlighter/src/java/org/apache/lucene/search/postingshighlight/PostingsHighlighter.java
 	    for ( Query rewrittenQuery = query.rewrite(this.reader());
                  !rewrittenQuery.equals(query);
                  rewrittenQuery = query.rewrite(this.reader())) {
 		query = (SpanQuery) rewrittenQuery;
 	    };
+	    
 
 	    // Todo: run this in a separated thread
 	    for (AtomicReaderContext atomic : this.reader().leaves()) {