diff --git a/Aviso/frmGesamtsicherheitenNEU.vb b/Aviso/frmGesamtsicherheitenNEU.vb
index ef80ab7..0a4bbfb 100644
--- a/Aviso/frmGesamtsicherheitenNEU.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.vb
@@ -84,12 +84,18 @@ Public Class frmGesamtsicherheitenNEU
             txtlkwIdSearch.initSearchBox(Me.FindForm, "  LKW_Nr, AvisoID, CAST(Datum as Date) as Datum FROM [Aviso]", {"LKW_Nr", "AvisoID", "Datum"}, "", "Datum desc", "LKW_Nr", "AvisoID", "AVISO",, 250, 200)
 
             If Standort = "AMBAR GmbH" Then
-                If cboFiliale.Items.Count > 0 Then
-                    cboFiliale.SelectedIndex = 0
-                End If
-                If cboWarenort.Items.Count > 0 Then
-                    cboWarenort.changeItem("5701")
-                End If
+                For i As Integer = 0 To cboFiliale.Items.Count - 1
+                    If cboFiliale.Items(i).ToString().Contains("5701") Then
+                        cboFiliale.SelectedIndex = i
+                        Exit For
+                    End If
+                Next
+                For i As Integer = 0 To cboWarenort.Items.Count - 1
+                    If cboWarenort.Items(i).ToString().Contains("AMBAR") Then
+                        cboWarenort.SelectedIndex = i
+                        Exit For
+                    End If
+                Next
             End If
 
         Else