diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticControllerOPListe.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticControllerOPListe.java
index ac93562..d34c954 100644
--- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticControllerOPListe.java
+++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticControllerOPListe.java
@@ -65,15 +65,14 @@ public class AGLAnalyticControllerOPListe implements Serializable {
 	boolean refreshCalculation = false;
 
 	public void onEvent(@Observes AnalyticEvent event) {
-		if (!"workitem".equals(event.getWorkitem().getType())
-				|| !event.getWorkitem().getModelVersion().startsWith("analyse-opliste")) {
+
+		if (!event.getWorkitem().getModelVersion().contains("analyse-opliste-")) {
 			// no op
 			return;
 		}
 
 		department = null;
 		departmentID = event.getWorkitem().getItemValueString("space.ref");
-
 		if (departmentIDLast == null || !departmentID.equals(departmentIDLast)) {
 			department = documentService.load(departmentID);
 			if (department != null) {
diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapter.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapter.java
index b83e986..1b4dff5 100644
--- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapter.java
+++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapter.java
@@ -108,7 +108,7 @@ public class OPListExportAdapter extends POIFindReplaceAdapter {
         String textblock = excelDefCollection.getItemValueString("textblock");
         String template = excelDefCollection.getItemValueString("template");
         String targetName = excelDefCollection.getItemValueString("target-name");
-        boolean filter = evalItemCollection.getItemValueBoolean("filter");
+        boolean filter = excelDefCollection.getItemValueBoolean("filter");
 
         // adapt text....
         targetName = workflowService.adaptText(targetName, document);