--- a/src/main/java/de/mpiwg/itgroup/ismi/entry/beans/AbstractISMIBean.java	Thu Jan 26 19:35:49 2017 +0100
+++ b/src/main/java/de/mpiwg/itgroup/ismi/entry/beans/AbstractISMIBean.java	Mon Jan 30 20:35:36 2017 +0100
@@ -298,7 +298,7 @@
 		for (SelectableObject<Reference> so : this.endNoteRefTable.list) {
 			Reference ref = so.getObj();
 			Entity entRef = ref.getEnt();
-			getWrapper().saveEntity(entRef, getUserName());
+			getWrapper().saveEntity(entRef, getUserName(), Reference.editReferenceIntent);
 			//entity can be no persistent, therefore the assignment of the relation should be done after the save
 			entRef.addSourceRelation(rel_is_reference_of, entity);
 			//new Relation(entRef, entity, rel_is_reference_of);
@@ -903,26 +903,26 @@
         /*
          * run updates depending on type
          */
-        if (entity.getObjectClass().equals(PLACE)) {
+        String oc = entity.getObjectClass();
+		if (oc.equals(PLACE)) {
             this.generateOW4City(entity, nodeList, user);
             getWrapper().saveEntityListAsNodeWithoutContent(nodeList, user);
 
-        } else if (entity.getObjectClass().equals(REPOSITORY)) {
+        } else if (oc.equals(REPOSITORY)) {
             this.generateOW4Repository(entity, nodeList, new HashMap<String, String>(), user);
             getWrapper().saveEntityListAsNodeWithoutContent(nodeList, user);
 
-        } else if (entity.getObjectClass().equals(COLLECTION)) {
+        } else if (oc.equals(COLLECTION)) {
             this.generateOW4Collection(entity, nodeList, new HashMap<String, String>(), user);
             getWrapper().saveEntityListAsNodeWithoutContent(nodeList, user);
 
-        } else if (entity.getObjectClass().equals(CODEX)) {
+        } else if (oc.equals(CODEX)) {
             this.generateOW4Codex(entity, nodeList, new HashMap<String, String>(), user);
             getWrapper().saveEntityListAsNodeWithoutContent(nodeList, user);
 
-        } else if (entity.getObjectClass().equals(TEXT)) {
+        } else if (oc.equals(TEXT)) {
             generateOW4Text(entity, user);
         }
-        // TODO PERSON and TEXT
     }
 	
 	private void generateOW4City(Entity city, List<Entity> nodeList, String user){
@@ -1010,6 +1010,7 @@
 	}
 	
 	private void generateOW4Text(Entity text, String user) throws Exception{
+		// FIXME: these loops seem to be wrong :-(
 		List<Entity> witnessList = getWrapper().getSourcesForTargetRelation(text, "is_exemplar_of", WITNESS, -1);
 		List<Entity> listToSave = new ArrayList<Entity>();
 		for(Entity witness : witnessList){