diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 9b296de..7bf3421 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -3,7 +3,7 @@
 ### 1.2.17 (Development)
 
  - neue Archive suche
- - invoice.exchangerate Input ersetzt nun . durch , damit der Wert richtig gespeichert wird!!
+ - invoice.exchangerate Input ersetzt nun . durch , und locale='de' damit der Wert richtig gespeichert wird!!
 
 ### 1.2.16 
 
diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CustomSearchController.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CustomSearchController.java
index 7d936c5..c55f868 100644
--- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CustomSearchController.java
+++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CustomSearchController.java
@@ -72,6 +72,9 @@ public class CustomSearchController implements Serializable {
         Date closingDate = searchEvent.getSearchFilter().getItemValueDate("invoice.closingdate");
 
         String cdtrNumber = searchEvent.getSearchFilter().getItemValueString("cdtr.number");
+        String invoiceType = searchEvent.getSearchFilter().getItemValueString("invoice.type");
+
+        String invoiceNumber = searchEvent.getSearchFilter().getItemValueString("invoice.number");
 
         // invoice.total
         if (invoiceTotal != 0) {
@@ -98,6 +101,26 @@ public class CustomSearchController implements Serializable {
             query += " ($lasteventdate:" + CustomSearchController.getRangeMonth(closingDate) + ")";
         }
 
+        if (invoiceNumber != null && !invoiceNumber.isEmpty()) {
+            query += " (invoice.number:" + invoiceNumber + ")";
+        }
+
+        // Rechnungsart
+        if (invoiceType != null && !"0".equals(invoiceType)) {
+            if ("1".equals(invoiceType)) {
+                query += " ($workflowgroup:\"Rechnungseingang\" AND NOT payment.type:credit)";
+            }
+            if ("2".equals(invoiceType)) {
+                query += " ($workflowgroup:Sachrechnung)";
+            }
+            if ("3".equals(invoiceType)) {
+                query += " (($workflowgroup:Rechnungseingang) AND (payment.type:credit))";
+            }
+            if ("4".equals(invoiceType)) {
+                query += " ($workflowgroup:\"Gutschrift Abgleich\")";
+            }
+        }
+
         // dbtr.number
         if (cdtrNumber != null && !cdtrNumber.isEmpty()) {
             cdtrNumber = cdtrNumber.trim().toUpperCase();
diff --git a/office-alexander-logistics-app/src/main/resources/imixs.properties b/office-alexander-logistics-app/src/main/resources/imixs.properties
index e7e37bc..bf83402 100644
--- a/office-alexander-logistics-app/src/main/resources/imixs.properties
+++ b/office-alexander-logistics-app/src/main/resources/imixs.properties
@@ -4,7 +4,7 @@
 lucence.indexDir=${imixs-office.IndexDir}
 index.fields=txtsearchstring,txtSubject,txtname,txtEmail,txtUserName,namCreator,txtworkflowgroup,txtworkflowstatus,txtWorkflowAbstract,txtWorkflowSummary,txtworkflowhistory,txtspacename,txtprocessname,_subject,_description,_name,_projectnumber,_projectname,_ordernumber,_contractnumber,datDueDate,txtcommentlog,htmldescription,htmldocumentation,dms,dms_names,invoice.number.stripped,_childitems,$file.names,_VENDOR_NAME,dbtr.number,cdtr.number
 index.fields.analyze=txtUsername
-index.fields.noanalyze=type,$UniqueIDRef,$created,$modified,$ModelVersion,$participants,namCreator,$ProcessID,datDate,txtWorkflowGroup,txtemail, datdate, datfrom, datto, numsequencenumber,dms_count,invoice.number,invoice.number.stripped,invoice.date,invoice.duedate,taxonomy.verteilung.stop,taxonomy.sachpruefung.stop,taxonomy.verteilung.start,taxonomy.sachpruefung.start,taxonomy.buchhaltung.start,taxonomy.buchhaltung.stop,dbtr.number,cdtr.number,payment.date,invoice.total,$lasteventdate
+index.fields.noanalyze=type,$UniqueIDRef,$created,$modified,$ModelVersion,$participants,namCreator,$ProcessID,datDate,txtWorkflowGroup,txtemail, datdate, datfrom, datto, numsequencenumber,dms_count,invoice.number,invoice.number.stripped,invoice.date,invoice.duedate,taxonomy.verteilung.stop,taxonomy.sachpruefung.stop,taxonomy.verteilung.start,taxonomy.sachpruefung.start,taxonomy.buchhaltung.start,taxonomy.buchhaltung.stop,dbtr.number,cdtr.number,payment.date,invoice.total,$lasteventdate,payment.type
 index.fields.store=process.name,txtProcessName,txtWorkflowImageURL,payment.date,invoice.number,invoice.date,invoice.duedate
 index.fields.category=space.name,space.ref,taxonomy.verteilung.stop.by,taxonomy.sachpruefung.stop.by,taxonomy.buchhaltung.stop.by
 office.search.noanalyze=invoice.number,invoice.number.stripped
diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/exchangerate.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/exchangerate.xhtml
index 5652ad1..05d09e3 100644
--- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/exchangerate.xhtml
+++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/exchangerate.xhtml
@@ -3,7 +3,7 @@
 	xmlns:h="http://xmlns.jcp.org/jsf/html">
 
 	<ui:fragment rendered="#{!readonly}">
-		abd<h:inputText required="#{validationController.required}" value="#{workitem.item['invoice.exchangerate']}"
+		<h:inputText required="#{validationController.required}" value="#{workitem.item['invoice.exchangerate']}"
 			onchange="this.value=this.value.replace('.', ',');">
 			<f:convertNumber pattern="#0.00000" locale="de" />
 		</h:inputText>
diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/worklist_search_custom.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/worklist_search_custom.xhtml
index 612016f..2fb3918 100644
--- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/worklist_search_custom.xhtml
+++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/worklist_search_custom.xhtml
@@ -4,6 +4,7 @@
 	xmlns:marty="http://xmlns.jcp.org/jsf/composite/marty" xmlns:i="http://xmlns.jcp.org/jsf/composite/imixs">
 
 	<!-- *** Krieger Custom Search form *** -->
+	<hr style="border-width:5px" />
 	<div class="imixs-form-section-3">
 		<dl>
 			<dt>#{custom.invoiceamount}:</dt>
@@ -51,7 +52,36 @@
 			</dd>
 		</dl>
 
+		<dl>
+			<dt>#{custom.invoicenumber}:</dt>
+			<dd>
+				<h:inputText value="#{searchController.searchFilter.item['invoice.number']}">
+
+				</h:inputText>
+			</dd>
+		</dl>
+
+	</div>
+	<div class="imixs-form-section">
+
+		<dl>
+			<dt>Rechnungsart:</dt>
+			<dd>
+
+				<h:selectOneRadio value="#{searchController.searchFilter.item['invoice.type']}">
+					<f:selectItem itemLabel="Alle" itemValue="0" />
+					<f:selectItem itemLabel="Cargo Rechnung" itemValue="1" />
+					<f:selectItem itemLabel="Sachrechnung" itemValue="2" />
+					<f:selectItem itemLabel="Gutschrift" itemValue="3" />
+					<f:selectItem itemLabel="Gutschrift Abgleich" itemValue="4" />
+				</h:selectOneRadio>
+
+
+			</dd>
+		</dl>
+
 
 
 	</div>
+	<hr style="border-width:5px" />
 </ui:composition>
\ No newline at end of file