diff --git a/src/main/java/de/ids_mannheim/korap/query/spans/ElementSpans.java b/src/main/java/de/ids_mannheim/korap/query/spans/ElementSpans.java
index 597f322..1a93456 100644
--- a/src/main/java/de/ids_mannheim/korap/query/spans/ElementSpans.java
+++ b/src/main/java/de/ids_mannheim/korap/query/spans/ElementSpans.java
@@ -40,10 +40,10 @@
     
 	public static enum PayloadTypeIdentifier {
 		ELEMENT(64), 
-		ELEMENT_WITH_TUI(65), 
-		ELEMENT_WITH_CERTAINTY_VALUE (66), 
-		ELEMENT_WITH_TUI_AND_CERTAINTY_VALUE (67), 
-		MILESTONE (68);
+        // ELEMENT_WITH_TUI(65),
+        // ELEMENT_WITH_CERTAINTY_VALUE (66),
+        // ELEMENT_WITH_TUI_AND_CERTAINTY_VALUE (67),
+        MILESTONE(65);
 		
 		private int value;
 
@@ -136,13 +136,12 @@
 			this.payloadTypeIdentifier = bb.get(0);
 			this.matchEndPosition = bb.getInt(9);
 
-			if (payloadTypeIdentifier == PayloadTypeIdentifier.ELEMENT_WITH_TUI.value
-					|| payloadTypeIdentifier == PayloadTypeIdentifier.ELEMENT_WITH_TUI_AND_CERTAINTY_VALUE.value) {
+            if (payloadTypeIdentifier == PayloadTypeIdentifier.ELEMENT.value
+                    && length > 15) {
 				this.setSpanId(bb.getShort(14));
 				this.hasSpanId = true;
 			}
             else {
-				// System.out.println(payloadTypeIdentifier);
                 this.setSpanId((short) -1);
             }