diff --git a/de.uniwue.mk.athen/bundles/de.uniwue.mk.kall.athen.goldstandardAnalyzer/src/de/uniwue/mk/kall/athen/goldstandardAnalyzer/GoldstandardAnalyzer.java b/de.uniwue.mk.athen/bundles/de.uniwue.mk.kall.athen.goldstandardAnalyzer/src/de/uniwue/mk/kall/athen/goldstandardAnalyzer/GoldstandardAnalyzer.java
index 5337333ef2b1a27b64762e47fb5f6c9a3636dcb6..b2ee919250200731dc7bea352c377c24804e4333 100644
--- a/de.uniwue.mk.athen/bundles/de.uniwue.mk.kall.athen.goldstandardAnalyzer/src/de/uniwue/mk/kall/athen/goldstandardAnalyzer/GoldstandardAnalyzer.java
+++ b/de.uniwue.mk.athen/bundles/de.uniwue.mk.kall.athen.goldstandardAnalyzer/src/de/uniwue/mk/kall/athen/goldstandardAnalyzer/GoldstandardAnalyzer.java
@@ -296,12 +296,17 @@ public class GoldstandardAnalyzer extends AEditorSubordinateViewPart {
 
 		editor.removeAnnotations(toDelete);
 
-		for (AnnotationFS anno : toDelete) {
-			editor.getCas().removeFsFromIndexes(anno);
-		}
+		// for (AnnotationFS anno : toDelete) {
+		// editor.getCas().removeFsFromIndexes(anno);
+		// }
 	}
 
 	public void deleteAnnotations() {
+		
+		//reset maps
+		this.fnMap.clear();
+		this.fpMap.clear();
+		this.tpMap.clear();
 
 		List<AnnotationFS> annoList = new ArrayList<>();
 		AnnotationIndex<AnnotationFS> annotationIndex = editor.getCas().getAnnotationIndex(tpType);
@@ -321,7 +326,11 @@ public class GoldstandardAnalyzer extends AEditorSubordinateViewPart {
 		while (iterator2.hasNext()) {
 			annoList.add((AnnotationFS) iterator2.next());
 		}
-		deleteAnnotations(annoList.toArray(new AnnotationFS[0]));
+		for (AnnotationFS a : annoList) {
+			editor.getCas().removeFsFromIndexes(a);
+		}
+		editor.updateWidget();
+		// deleteAnnotations(annoList.toArray(new AnnotationFS[0]));
 	}
 
 	public void compareTypes() {
@@ -401,6 +410,7 @@ public class GoldstandardAnalyzer extends AEditorSubordinateViewPart {
 	}
 
 	public void createMap() {
+		this.m = new HashMap<>();
 		m.putAll(tpMap);
 		m.putAll(fpMap);
 		m.putAll(fnMap);