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 f624499..7d936c5 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
@@ -96,16 +96,25 @@ public class CustomSearchController implements Serializable {
         // invoice.closingdate
         if (closingDate != null) {
             query += " ($lasteventdate:" + CustomSearchController.getRangeMonth(closingDate) + ")";
-
         }
 
         // dbtr.number
         if (cdtrNumber != null && !cdtrNumber.isEmpty()) {
-            cdtrNumber = cdtrNumber.trim();
-            if (!cdtrNumber.startsWith("K")) {
-                cdtrNumber = "K" + cdtrNumber;
+            cdtrNumber = cdtrNumber.trim().toUpperCase();
+            if (!cdtrNumber.startsWith("K") && !cdtrNumber.startsWith("D")) {
+                query += " (cdtr.number:K" + cdtrNumber + " OR dbtr.number:" + cdtrNumber + ")";
+            } else {
+                if (cdtrNumber.startsWith("K")) {
+                    // suche nach Kreditor (Eingangsrechnung)
+                    query += " (cdtr.number:" + cdtrNumber + ")";
+                } else {
+                    // suche nach Debitor (Ausgangsrechnung)
+                    if (cdtrNumber.startsWith("D")) {
+                        cdtrNumber = cdtrNumber.substring(1);
+                    }
+                    query += " (dbtr.number:" + cdtrNumber + ")";
+                }
             }
-            query += " (cdtr.number:" + cdtrNumber + ")";
         }
 
         // Udpate query
diff --git a/office-alexander-logistics-app/src/main/resources/bundle/custom_de.properties b/office-alexander-logistics-app/src/main/resources/bundle/custom_de.properties
index 379399b..0e47cc8 100644
--- a/office-alexander-logistics-app/src/main/resources/bundle/custom_de.properties
+++ b/office-alexander-logistics-app/src/main/resources/bundle/custom_de.properties
@@ -27,7 +27,7 @@ pos.net=Netto
 pos.gross=Brutto
 
 creditor_name=Kreditor
-creditor_number=Kreditornummer
+creditor_number=Kreditor- / Debitornummer
 invoicenumber=Rechnungsnummer
 invoicedate=Rechnungsdatum
 invoiceduedate=Fälligkeit
diff --git a/office-alexander-logistics-app/src/main/resources/bundle/custom_en.properties b/office-alexander-logistics-app/src/main/resources/bundle/custom_en.properties
index e480a17..46250e8 100644
--- a/office-alexander-logistics-app/src/main/resources/bundle/custom_en.properties
+++ b/office-alexander-logistics-app/src/main/resources/bundle/custom_en.properties
@@ -27,7 +27,7 @@ pos.net=Net
 pos.gross=Gross
 
 creditor_name=Creditor
-creditor_number=Creditor No.
+creditor_number=Creditor/Debitor No.
 invoicenumber=Invoice No.
 invoicedate=Invoice Date
 invoiceduedate=Due Date