diff --git a/entity/BulkMail_entity/entityfields/testmail/onActionProcess.js b/entity/BulkMail_entity/entityfields/testmail/onActionProcess.js
index 586f9b64418c14312ae037a449bff06062fb15e2..a77b2d89d480dd2f0018295bfd128955abe390b4 100644
--- a/entity/BulkMail_entity/entityfields/testmail/onActionProcess.js
+++ b/entity/BulkMail_entity/entityfields/testmail/onActionProcess.js
@@ -1,18 +1,6 @@
-import("system.neon");
-import("system.db");
-import("Employee_lib");
 import("system.vars");
 import("Bulkmail_lib");
 
-//var testingContact = vars.get("$field.TESTING_CONTACT_ID");
-//var testingEmail = vars.get("$field.TESTING_EMAIL_ADDRESS");
-//
-//if (testingContact && testingEmail)
-//    BulkMailUtils.sendBulkMailOnServer(vars.get("$field.BULKMAILID"), [[testingContact, testingEmail]]);
-//else
-//    neon.openContext("BulkMailTesting", "BulkMailTesting_view", null, neon.OPERATINGSTATE_VIEW, {
-//        "BulkMailId_param" : vars.get("$field.BULKMAILID")
-//    });
 
 BulkMailUtils.sendBulkMailOnServer(vars.get("$field.BULKMAILID"), true);
 
diff --git a/entity/LinkTag_entity/LinkTag_entity.aod b/entity/LinkTag_entity/LinkTag_entity.aod
index ad214e7733018403964af98a12bafb5fe343372e..6fe8872547a77acde027305821cd7b979af737ba 100644
--- a/entity/LinkTag_entity/LinkTag_entity.aod
+++ b/entity/LinkTag_entity/LinkTag_entity.aod
@@ -35,7 +35,6 @@
     </entityField>
     <entityField>
       <name>LINKTAGID</name>
-      <valueProcess>%aditoprj%/entity/LinkTag_entity/entityfields/linktagid/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>LINK_ID</name>
diff --git a/entity/LinkTag_entity/entityfields/linktagid/valueProcess.js b/entity/LinkTag_entity/entityfields/linktagid/valueProcess.js
deleted file mode 100644
index 08b0f362f956f1724c4c20702edb12f67d60e17e..0000000000000000000000000000000000000000
--- a/entity/LinkTag_entity/entityfields/linktagid/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.util");
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-
-if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
-    result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/Link_entity/entityfields/placeholder/onValidation.js b/entity/Link_entity/entityfields/placeholder/onValidation.js
index 24c6c4421b528aa9262ec2137ba991e0091ca6e6..1c1c14a472eab79ff8aadeaddda910bb92ee112e 100644
--- a/entity/Link_entity/entityfields/placeholder/onValidation.js
+++ b/entity/Link_entity/entityfields/placeholder/onValidation.js
@@ -12,11 +12,9 @@ if (vars.get("$local.value"))
         .and("LINK.PLACEHOLDER is not null")
         .arrayColumn();
                 
+    var defaultPlaceholderNames = defaultPlaceholders.map(function(placeholder){return placeholder.placeholderName});
     
-    if (defaultPlaceholders.map(function(a)
-        {
-            return a.placeholderName
-        }).indexOf(vars.get("$local.value"))!= -1 || linkPlaceholders.indexOf(vars.get("$local.value"))!= -1)
+    if(defaultPlaceholderNames.includes(vars.get("$local.value")) || linkPlaceholders.includes("$local.value"))
     {
         result.string("Placeholders must be unique")
     }
diff --git a/entity/Link_entity/entityfields/placeholder/stateProcess.js b/entity/Link_entity/entityfields/placeholder/stateProcess.js
index a4e4097c3679319859ff91df60aefa982aff9911..6f8493a6eddf626aff691774d4d80826f20c633c 100644
--- a/entity/Link_entity/entityfields/placeholder/stateProcess.js
+++ b/entity/Link_entity/entityfields/placeholder/stateProcess.js
@@ -6,7 +6,8 @@ import("system.neon");
 
 var linktype = vars.get("$field.LINKTYPE")
 var res = neon.COMPONENTSTATE_INVISIBLE
-if (linktype == $KeywordRegistry.linkType$EMail()){
+if (linktype == $KeywordRegistry.linkType$EMail())
+{
     res = neon.COMPONENTSTATE_EDITABLE;
 }
 result.string(res);
\ No newline at end of file
diff --git a/entity/Link_entity/entityfields/url/onValidation.js b/entity/Link_entity/entityfields/url/onValidation.js
index db3f8d4666265d7ec1e44570a0bd9be4239c6984..7aa2aee48d841bc204fd8e411f05080b6f48f63e 100644
--- a/entity/Link_entity/entityfields/url/onValidation.js
+++ b/entity/Link_entity/entityfields/url/onValidation.js
@@ -7,7 +7,7 @@ import("Sql_lib");
 if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && vars.get("$local.value"))
 {
     if (newSelect("URL").from("LINK").where("LINK.URL", vars.get("$local.value")).cell())
-        result.string(translate.text("Die Url muss eindeutig sein!"))
+        result.string(translate.text("Url must be unique"));
     
     if (vars.get("$field.REDIRECT") == "1" && !/^(?:http(s)?:\/\/)[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\(\)\*\+,;=.]+$/g.test(vars.get("$local.value")))
     {
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 757a9b87c352dbd71b363ee1c9a33e50aadfca44..b379e7c428d2071c131c4571b798f7c7104b1d8b 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -8223,6 +8223,18 @@
     <entry>
       <key>Send Date</key>
     </entry>
+    <entry>
+      <key>Filter can't be empty</key>
+    </entry>
+    <entry>
+      <key>Opening Date</key>
+    </entry>
+    <entry>
+      <key>Recipient filter</key>
+    </entry>
+    <entry>
+      <key>Url must be unique</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
   <sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index cb20815ec4a7fea373d3138539e53d6a8f828f34..d19f8b68f4eabe602e69c38c1623e565b7bca754 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -10,6 +10,10 @@
       <key>Event End</key>
       <value>Veranstaltungs Ende</value>
     </entry>
+    <entry>
+      <key>Redirect needs a full Url with http/https</key>
+      <value>Für die Weiterleitung wird eine vollständige Url mit http/https benötigt</value>
+    </entry>
     <entry>
       <key>Use for test run</key>
       <value>Bei Testversand verwenden</value>
@@ -22,6 +26,10 @@
       <key>Set Test Recipient</key>
       <value>Testempfänger setzen</value>
     </entry>
+    <entry>
+      <key>Url must be unique</key>
+      <value>Die Url muss eindeutig sein!</value>
+    </entry>
     <entry>
       <key>Opening Date</key>
       <value>Öffnungsdatum</value>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 318acfbfa89838ee010b3d075da0a26fc28c86fc..dba023c30af6020888a2ddfcd9a56938b1b9d509 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -8304,6 +8304,18 @@
     <entry>
       <key>Send Date</key>
     </entry>
+    <entry>
+      <key>Filter can't be empty</key>
+    </entry>
+    <entry>
+      <key>Opening Date</key>
+    </entry>
+    <entry>
+      <key>Recipient filter</key>
+    </entry>
+    <entry>
+      <key>Url must be unique</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>