diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb
index 493db3b..2527cca 100644
--- a/Customers/CustomsAviso.aspx.vb
+++ b/Customers/CustomsAviso.aspx.vb
@@ -72,13 +72,13 @@ Partial Class Kundenbereich_Default
         ElseIf rbt_Erf.Checked = False And rbt_Freig.Checked = False And rbt_Ankunft.Checked = False And rbt_Vorb.Checked = False And rbt_Vorg.Checked = False Then
             If pickdate1.Text = "TT.MM.JJJJ" And pickdate2.Text = "TT.MM.JJJJ" Then
                 MsgBox("Bitte ein Datum auswählen!", MsgBoxStyle.Information, "Information!")
-            End If
-            pickdate1.Text = Date.ParseExact("01" + "-" + Date.Now.Month.ToString + "-" + Date.Now.Year.ToString, "dd-MM-yyyy", Nothing).ToString
+
+                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
                 datevon = Date.ParseExact(pickdate1.Text, "dd-MM-yyyy", Nothing)
-            datebis = Date.ParseExact(pickdate2.Text, "dd-MM-yyyy", Nothing)
+                datebis = Date.ParseExact(pickdate2.Text, "dd-MM-yyyy", Nothing)
 
-            If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
+                If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
                     Try
                         datevon = Date.Parse(pickdate1.Text)
                         datebis = Date.Parse(pickdate2.Text)
@@ -89,17 +89,18 @@ Partial Class Kundenbereich_Default
                 End If
 
                 dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
-        Else
-            If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
-                Try
-                    datevon = Date.Parse(pickdate1.Text)
-                    datebis = Date.Parse(pickdate2.Text)
-                Catch ex As Exception
-                    MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation)
-                End Try
-            Else
+                Else
+                If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
+                    Try
+                        datevon = Date.Parse(pickdate1.Text)
+                        datebis = Date.Parse(pickdate2.Text)
+                    Catch ex As Exception
+                        MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation)
+                    End Try
+                Else
+                End If
+                dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
             End If
-            dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
         End If
 
         If dt IsNot Nothing Then
@@ -152,9 +153,9 @@ Partial Class Kundenbereich_Default
                     Case 1
                         tbl_CellStatus.Text = "Erfasst"
                         tr.Cells.Add(tbl_CellStatus)
-                            'Case 2
-                            ' tbl_CellStatus = "Nicht eingetroffen"
-                           ' tr.Cells.Add(Cell)
+                    Case 2
+                        tbl_CellStatus.Text = "Nicht eingetroffen"
+                        tr.Cells.Add(Cell)
                     Case 3
                         tbl_CellStatus.Text = "Ankunft"
                         tr.Cells.Add(tbl_CellStatus)
@@ -181,17 +182,17 @@ Partial Class Kundenbereich_Default
                 tr.Cells.Add(tbl_CellLKWs)
                 tbl_CellKundAuftNr.Text = d("KdAuftragsNr_Avisierer").ToString
                 tr.Cells.Add(tbl_CellKundAuftNr)
-                If rbt_Ankunft.Checked = True And tbl_CellStatus.Text = "Ankunft" Then
+                If rbt_Ankunft.Checked = True AndAlso tbl_CellStatus.Text = "Ankunft" Then
                     normaltable.Rows.Add(tr)
-                ElseIf rbt_Erf.Checked = True And tbl_CellStatus.Text = "Erfasst" Then
+                ElseIf rbt_Erf.Checked = True AndAlso tbl_CellStatus.Text = "Erfasst" Then
                     normaltable.Rows.Add(tr)
-                ElseIf rbt_Freig.Checked = True And tbl_CellStatus.Text = "Freigegeben" Then
+                ElseIf rbt_Freig.Checked = True AndAlso tbl_CellStatus.Text = "Freigegeben" Then
                     normaltable.Rows.Add(tr)
-                ElseIf rbt_Vorb.Checked = True And tbl_CellStatus.Text = "Vorbereitet" Then
+                ElseIf rbt_Vorb.Checked = True AndAlso tbl_CellStatus.Text = "Vorbereitet" Then
                     normaltable.Rows.Add(tr)
-                ElseIf rbt_Vorg.Checked = True And tbl_CellStatus.Text = "Vorgeschrieben" Then
+                ElseIf rbt_Vorg.Checked = True AndAlso tbl_CellStatus.Text = "Vorgeschrieben" Then
                     normaltable.Rows.Add(tr)
-                ElseIf rbt_Vorg.Checked = False And rbt_Ankunft.Checked = False And rbt_Erf.Checked = False And rbt_Freig.Checked = False And rbt_Vorb.Checked = False And tbl_CellStatus.Text = "Undefiniert" Then
+                ElseIf rbt_Erf.Checked = False And rbt_Ankunft.Checked = False And rbt_Vorg.Checked = False And rbt_Freig.Checked = False And rbt_Vorb.Checked = False Then
                     normaltable.Rows.Add(tr)
                 End If