diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/PreserveExistingFileUpload.java b/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/PreserveExistingFileUpload.java
index 0be1b6a265a41c5026d3b55adda0d319b4b20996..e3c4d0cf3a98c398ea0765e22ce1786464426362 100644
--- a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/PreserveExistingFileUpload.java
+++ b/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/PreserveExistingFileUpload.java
@@ -25,14 +25,11 @@ import com.google.gwt.event.dom.client.ChangeEvent;
 import com.google.gwt.event.dom.client.ChangeHandler;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
-import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.FileUpload;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.VerticalPanel;
-import com.google.gwt.user.client.ui.Widget;
-
 import de.latlon.xplan.manager.web.client.gui.widget.Validable;
 import de.latlon.xplan.manager.web.client.i18n.XPlanWebMessages;
 
@@ -102,14 +99,6 @@ public class PreserveExistingFileUpload extends VerticalPanel implements Validab
 		return filename != null && filename.length() > 0;
 	}
 
-	/**
-	 * @param isEnabled true if enable, false otherwise
-	 */
-	public void setEnabled(boolean isEnabled) {
-		selectedFile.setEnabled(isEnabled);
-		removeButton.setEnabled(isEnabled);
-	}
-
 	/**
 	 * @param changeHandler the ChangeHandler to add
 	 */
diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/text/TextDialog.java b/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/text/TextDialog.java
index 2822dde2ee724507224b93ddb9f0bae70c2c7819..beb7b9bfce586470883fa07430857f819825865b 100644
--- a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/text/TextDialog.java
+++ b/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/text/TextDialog.java
@@ -100,13 +100,22 @@ public class TextDialog extends EditDialogBoxWithRasterUpload {
 		if (rechtscharakterType != null) {
 			editedText.setRechtscharakter(rechtscharakterType.getValueAsEnum());
 		}
-		if (XPLAN_60.equals(version) && (textToEdit == null || textToEdit.getReferenzName() == null)) {
-			String referenzName = parseReferenzNameFromReferenzUrl();
-			editedText.setReferenzName(referenzName);
+		if (XPLAN_60.equals(version)) {
+			String referenceName = getReferenceName(text.getValue());
+			editedText.setReferenzName(referenceName);
 		}
 		return editedText;
 	}
 
+	private String getReferenceName(String textValue) {
+		if (textValue != null && !textValue.isEmpty())
+			return null;
+		if (textToEdit != null && textToEdit.getReferenzName() != null) {
+			return textToEdit.getReferenzName();
+		}
+		return parseReferenzNameFromReferenzUrl();
+	}
+
 	@Override
 	protected boolean isReferenceUrlMandatory() {
 		return false;
diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/utils/ReferenceNameUtils.java b/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/utils/ReferenceNameUtils.java
index bb22a682e91af3c98e5bf4ec12423c2ad4a092e6..c7de5ce4519d9670172b2cf944a57628e80843e4 100644
--- a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/utils/ReferenceNameUtils.java
+++ b/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/utils/ReferenceNameUtils.java
@@ -18,7 +18,7 @@ public final class ReferenceNameUtils {
 
 	public static String extractFilenameFromUrl(String url) {
 		if (url == null || url.isEmpty()) {
-			return UNKNOWN;
+			return null;
 		}
 		url = removeTrailingQuestionmark(url);
 		if (url.contains("?")) {
diff --git a/xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/utils/ReferenceNameUtilsTest.java b/xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/utils/ReferenceNameUtilsTest.java
index 8fc98d7512ea3c5b6f41463005199d83f0be6dd8..de0fe7cc2127a641dd9da7757d78226dac2f9271 100644
--- a/xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/utils/ReferenceNameUtilsTest.java
+++ b/xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/utils/ReferenceNameUtilsTest.java
@@ -3,6 +3,7 @@ package de.latlon.xplan.manager.web.client.utils;
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 
 public class ReferenceNameUtilsTest {
@@ -89,7 +90,7 @@ public class ReferenceNameUtilsTest {
 	public void testThatParseFilenameFromUrlWithEmptyString() {
 		String url = "";
 		String filename = ReferenceNameUtils.extractFilenameFromUrl(url);
-		assertThat(filename, is("Unbekannt"));
+		assertThat(filename, nullValue());
 	}
 
 	@Test