diff --git a/Changes b/Changes
index 9d4d610..ba791db 100644
--- a/Changes
+++ b/Changes
@@ -1,9 +1,11 @@
-0.61.2 2023-03-28
+0.61.2 2023-04-05
     - [bugfix] Fix pagebreak retrieval (margaretha, diewald)
+    - [feature] Support token lists for match infos (solved #88,
+      diewald)
 
 0.61.1 2023-02-14
     - [bugfix] Fixed ensuring same documents of spans (solved #87, 
-    margaretha)
+       margaretha)
 
 0.61.0 2022-11-16
     - [cleanup] Remove ehcache from dependencies (diewald)
diff --git a/src/main/java/de/ids_mannheim/korap/KrillIndex.java b/src/main/java/de/ids_mannheim/korap/KrillIndex.java
index cf2187d..6ec2c0e 100644
--- a/src/main/java/de/ids_mannheim/korap/KrillIndex.java
+++ b/src/main/java/de/ids_mannheim/korap/KrillIndex.java
@@ -933,6 +933,18 @@
                 includeSpans, includeHighlights, extendToSentence);
     };
 
+    public Match getMatchInfo (String idString, String field, boolean info,
+                               List<String> foundry, List<String> layer, boolean includeSpans,
+                               boolean includeHighlights, boolean extendToSentence)
+        throws QueryException {
+        return getMatchInfo(
+            idString, field, info,
+            foundry, layer, includeSpans,
+            true, // include Snippets
+            false, // include Tokens
+            includeHighlights, extendToSentence
+            );
+    }
 
     /**
      * Get a match.
@@ -943,7 +955,8 @@
     */
     public Match getMatchInfo (String idString, String field, boolean info,
             List<String> foundry, List<String> layer, boolean includeSpans,
-            boolean includeHighlights, boolean extendToSentence)
+                               boolean includeSnippets, boolean includeTokens,
+                               boolean includeHighlights, boolean extendToSentence)
             throws QueryException {
 
         if (DEBUG)
@@ -960,9 +973,16 @@
         if (match.getStartPos() == -1)
             return match;
 
-        // For the moment, direct match retrievals will always include
-        // snippets. But this may change in the future.
-        match.hasSnippet = true;
+        if (includeTokens)
+            match.hasTokens = true;
+
+        if (includeSnippets) {
+            match.hasSnippet = true;
+        } else {
+            includeHighlights = false;
+            includeSpans = false;
+            info = false;
+        };
         
         // Create a filter based on the corpusID and the docID
         BooleanQuery bool = new BooleanQuery();
diff --git a/src/main/java/de/ids_mannheim/korap/response/Match.java b/src/main/java/de/ids_mannheim/korap/response/Match.java
index a40a7a6..7a0df8a 100644
--- a/src/main/java/de/ids_mannheim/korap/response/Match.java
+++ b/src/main/java/de/ids_mannheim/korap/response/Match.java
@@ -1399,6 +1399,9 @@
     public ObjectNode getSnippetTokens () {
         ObjectNode json = mapper.createObjectNode();
 
+        if (!this._processHighlight())
+            return null;
+
         if (this.processed && this.snippetTokens != null)
             return this.snippetTokens;
         
diff --git a/src/test/java/de/ids_mannheim/korap/index/TestMatchIdentifier.java b/src/test/java/de/ids_mannheim/korap/index/TestMatchIdentifier.java
index ade2efd..af4e7b5 100644
--- a/src/test/java/de/ids_mannheim/korap/index/TestMatchIdentifier.java
+++ b/src/test/java/de/ids_mannheim/korap/index/TestMatchIdentifier.java
@@ -878,10 +878,72 @@
 					 "</span>"+
 					 "<span class=\"context-right\">"+
 					 "<span class=\"more\"></span>"+
-					 "</span>",
-					 km.getSnippetHTML());
+                     "</span>",
+                     km.getSnippetHTML());
     };
 
+    @Test
+    public void indexExample8Tokens ()
+            throws IOException, QueryException {
+        KrillIndex ki = new KrillIndex();
+        ki.addDoc(createSimpleFieldDoc2());
+        ki.commit();
+
+        ArrayList<String> foundryList = new ArrayList<>(2);
+        foundryList.add("f");
+        foundryList.add("x");
+
+        ArrayList<String> layerList = new ArrayList<>(2);
+        layerList.add("is");
+        
+        Match km = ki.getMatchInfo(
+            "match-c1!d1-p0-4",
+            "tokens",
+            true,
+            null, //foundryList,
+            null, // layerList,
+            true,
+            false,
+            true,
+            true,
+            true);
+
+        JsonNode res = mapper.readTree(km.toJsonString());
+        assertEquals("c1", res.at("/corpusID").asText());
+        assertEquals("d1", res.at("/docID").asText());
+        assertFalse(res.at("/hasSnippet").asBoolean());
+        assertTrue(res.at("/hasTokens").asBoolean());
+        assertEquals("a", res.at("/tokens/match/0").asText());
+        assertEquals("b", res.at("/tokens/match/1").asText());
+        assertEquals("c", res.at("/tokens/match/2").asText());
+        assertEquals("a", res.at("/tokens/match/3").asText());
+        assertTrue(res.at("/tokens/match/4").isMissingNode());
+
+
+        km = ki.getMatchInfo(
+            "match-c1!d1-p0-4",
+            "tokens",
+            true,
+            null, //foundryList,
+            null, // layerList,
+            true,
+            true,
+            true,
+            true,
+            true);
+
+        res = mapper.readTree(km.toJsonString());
+        assertEquals("c1", res.at("/corpusID").asText());
+        assertEquals("d1", res.at("/docID").asText());
+        assertTrue(res.at("/hasSnippet").asBoolean());
+        assertTrue(res.at("/hasTokens").asBoolean());
+        assertEquals("a", res.at("/tokens/match/0").asText());
+        assertEquals("b", res.at("/tokens/match/1").asText());
+        assertEquals("c", res.at("/tokens/match/2").asText());
+        assertEquals("a", res.at("/tokens/match/3").asText());
+        assertTrue(res.at("/tokens/match/4").isMissingNode());
+    };
+    
 
     @Test
     public void indexExampleMultipleFoundries ()