diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index c9f0f90cd78f35f869f2c4606cf1587587a9a136..920c99b2fd495afba72bbd4b466149fdcdf2f3fc 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -4,7 +4,6 @@
   <title>Document Template</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <icon>VAADIN:FILE_FONT</icon>
-  <titleProcess>%aditoprj%/entity/DocumentTemplate_entity/titleProcess.js</titleProcess>
   <recordContainer>db</recordContainer>
   <entityFields>
     <entityProvider>
diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js b/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js
index 96bac18a0571ec7ecf4d5e350721b4393a0a1bc3..2478d8b4cf1bc15b794aa2936f2550f2d6d45360 100644
--- a/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js
@@ -4,11 +4,15 @@ import("system.vars");
 import("system.db");
 import("Sql_lib");
 
-var docTemplateType = vars.get("$param.DocumentTemplateType_param").trim();
-var docTemplateTypeClassification = vars.get("$param.DocumentTemplateTypeClassification_param").trim();
+var docTemplateType = vars.get("$param.DocumentTemplateType_param");
+var docTemplateTypeClassification = vars.get("$param.DocumentTemplateTypeClassification_param");
 
-if(docTemplateType != "" && docTemplateTypeClassification != "")
+
+if(docTemplateType != null && docTemplateType != "" && docTemplateTypeClassification != null && docTemplateTypeClassification != "")
 {
+    docTemplateType = docTemplateType.trim();
+    docTemplateTypeClassification = docTemplateTypeClassification.trim();
+    
     var cond = SqlCondition.begin()
                            .andPrepare("DOCUMENTTEMPLATE.TYPE", docTemplateType)
                            .andPrepare("DOCUMENTTEMPLATE.CLASSIFICATION", docTemplateTypeClassification)
diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/fromClauseProcess.js b/entity/DocumentTemplate_entity/recordcontainers/db/fromClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 7d2f77f09bf278dbf7cc5049d610c4a849c3fa42..29aee8674ed2b0febb6615706f062f6c917320a1 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -106,7 +106,6 @@
     </entityField>
     <entityField>
       <name>HEADER</name>
-      <title>Cover letter</title>
       <contentType>LONG_TEXT</contentType>
       <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/header/valueProcess.js</valueProcess>
     </entityField>
@@ -741,6 +740,7 @@
     </entityConsumer>
     <entityField>
       <name>chooseTEXHeader</name>
+      <title>Cover letter</title>
       <consumer>DocumentTemplateText</consumer>
     </entityField>
   </entityFields>
diff --git a/entity/Offer_entity/entityfields/header/valueProcess.js b/entity/Offer_entity/entityfields/header/valueProcess.js
index 54affd8d1dd840989e3e9092a406e5a374150ccc..508e3cb15b8c84962d2b371ab25377589620370b 100644
--- a/entity/Offer_entity/entityfields/header/valueProcess.js
+++ b/entity/Offer_entity/entityfields/header/valueProcess.js
@@ -1,6 +1,8 @@
 import("system.result");
 import("system.vars");
 import("system.neon");
+import("system.db");
+import("system.util");
 
 if(vars.exists("$param.OfferHeader_param") && vars.get("$param.OfferHeader_param")) 
     result.string(vars.get("$param.OfferHeader_param"));
@@ -10,3 +12,9 @@ else if(vars.get("$this.value"))
 
 else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
     result.string("gerne bieten wir Ihnen wie folgt an:")
+
+if (vars.get("$field.chooseTEXHeader") != "")
+{
+    var binaryId      = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.chooseTEXHeader") + "'", "_____SYSTEMALIAS");
+    result.string(util.decodeBase64String(db.getBinaryContent(binaryId, "_____SYSTEMALIAS")));
+}
\ No newline at end of file