diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx
index 8e073f0..aa591fd 100644
--- a/Customers/CustomsAviso.aspx
+++ b/Customers/CustomsAviso.aspx
@@ -34,7 +34,7 @@
 <asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
     <asp:ScriptManager ID="script1" runat="server"></asp:ScriptManager>
 
-    <asp:UpdatePanel ID="panelupdate1" runat="server"><ContentTemplate>
+    <asp:UpdatePanel ID="panelupdate1" runat="server" UpdateMode="Conditional"><ContentTemplate>
     
         <!-- Webiste-Content-->  
             <div id="containerseiterand" style="margin-left:auto;margin-right:auto">                
@@ -72,8 +72,7 @@
                                             <h2>Auftrags-Suche</h2>                                             
                             </div>
                             <div style="margin-left:6px">
-                            <div class="col-12" style="text-align:end">
-                                                                           
+                            <div class="col-12" style="text-align:end">                                                                           
                                             <asp:LinkButton ID="btn_resetForm" runat="server" onclick="btn_resetForm_Click" style="margin-right:2px">Filter zurücksetzen</asp:LinkButton>                               
                              </div>
                            
diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb
index a181efd..9ef202d 100644
--- a/Customers/CustomsAviso.aspx.vb
+++ b/Customers/CustomsAviso.aspx.vb
@@ -60,14 +60,15 @@ Partial Class Kundenbereich_Default
 
         'Dim tr
         If rbt_Alle.Selected = True Then
-            If pickdate1.Text = "TT.MM.JJJJ" And pickdate2.Text = "TT.MM.JJJJ" Then
+            If pickdate1.Text = Nothing AndAlso pickdate2.Text = Nothing Then
                 MsgBox("Bitte ein Datum auswählen!", MsgBoxStyle.Information, "Information!")
-                pickdate1.Text = Date.ParseExact("01" + "-" + Date.Now.Month.ToString + "-" + Date.Now.Year.ToString, "dd-MM-yyyy", Nothing).ToString
-                pickdate2.Text = Date.ParseExact(Date.Now.Day.ToString + "-" + Date.Now.Month.ToString + "-" + Date.Now.Year.ToString, "dd-MM-yyyy", Nothing).ToString
-            End If
 
-
-            If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
+                pickdate1.BackColor = Drawing.Color.Aqua
+                pickdate2.BackColor = Drawing.Color.Aqua
+                lbl_von.BackColor = Drawing.Color.Red
+                lbl_bis.BackColor = Drawing.Color.Red
+            Else
+                If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
                     Try
                         datevon = Date.Parse(pickdate1.Text)
                         datebis = Date.Parse(pickdate2.Text)
@@ -75,8 +76,10 @@ Partial Class Kundenbereich_Default
                         MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation)
                     End Try
                 End If
+                Return
+            End If
 
-                dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0, 1, 2, 3, 4, 5}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
+            dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0, 1, 2, 3, 4, 5}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
 
         ElseIf rbt_Erf.Selected = True Then
             dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0},,, Absender, Empfaenger, LKWNR, KDNAFNR)