diff --git a/core/src/main/java/de/jplag/reporting/reportobject/ReportObjectFactory.java b/core/src/main/java/de/jplag/reporting/reportobject/ReportObjectFactory.java
index e802c4ae49..350fcde709 100644
--- a/core/src/main/java/de/jplag/reporting/reportobject/ReportObjectFactory.java
+++ b/core/src/main/java/de/jplag/reporting/reportobject/ReportObjectFactory.java
@@ -220,9 +220,6 @@ private void writeSubmissionIndexFile(JPlagResult result, String path) {
         for (Submission submission : submissions) {
             Map<String, Integer> tokenCounts = new HashMap<>();
             for (Token token : submission.getTokenList()) {
-                if (token.getType().isExcludedFromMatching()) {
-                    continue;
-                }
                 String key = FilePathUtil.getRelativeSubmissionPath(token.getFile(), submission, submissionToIdFunction);
                 if (tokenCounts.containsKey(key)) {
                     tokenCounts.put(key, tokenCounts.get(key) + 1);
diff --git a/report-viewer/src/components/fileDisplaying/CodePanel.vue b/report-viewer/src/components/fileDisplaying/CodePanel.vue
index ae1fd19f4e..9f87703883 100644
--- a/report-viewer/src/components/fileDisplaying/CodePanel.vue
+++ b/report-viewer/src/components/fileDisplaying/CodePanel.vue
@@ -11,7 +11,7 @@
         class="font-normal"
       >
         <template #default
-          >{{ ((file.matchedTokenCount / file.tokenCount) * 100).toFixed(2) }}%</template
+          >{{ ((file.matchedTokenCount / (file.tokenCount - 1)) * 100).toFixed(2) }}%</template
         >
         <template #tooltip
           ><p class="whitespace-nowrap text-sm">