diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb
index f347f27..77ef21c 100644
--- a/Customers/CustomsAviso.aspx.vb
+++ b/Customers/CustomsAviso.aspx.vb
@@ -71,19 +71,61 @@ Partial Class CustomsAviso
         Else
             rbt_Alle.Checked = True
             normaltable.EnableViewState = True
+            lbl_von.Visible = True
+            lbl_bis.Visible = True
+            valDateRange_1.Enabled = True
+            valDateRange_2.Enabled = True
+            pickdate1.Visible = True
+            pickdate2.Visible = True
             Dim erster = New Date(Now().Year, Now().Month, 1)
             Dim ersterdat = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
             pickdate1.Text = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
             ' MsgBox(ersterdat)
             datevon = ersterdat
             datebis = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
-            pickdate2.Text = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
+            pickdate2.Text = Now().ToShortDateString()
             pickdate1.Text = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
-            If txt_LKWNr.Text = "" Then
+            If String.IsNullOrEmpty(txt_LKWNr.Text) Then
                 regexval_txt_LKW.Enabled = False
             Else
                 regexval_txt_LKW.Enabled = True
             End If
+            If String.IsNullOrEmpty(txt_KdNrAuftrag.Text) = True Then
+                regexval_txt_KdNrAuftrag.Enabled = False
+            Else
+                regexval_txt_KdNrAuftrag.Enabled = True
+            End If
+            If String.IsNullOrEmpty(txt_Empfaenger.Text) = True Then
+                regexval_txt_Empfaenger.Enabled = False
+            Else
+                regexval_txt_Empfaenger.Enabled = True
+            End If
+            If String.IsNullOrEmpty(txt_Absender.Text) = True Then
+                regexval_txt_Absender.Enabled = False
+            Else
+                regexval_txt_Absender.Enabled = True
+            End If
+
+            If String.IsNullOrEmpty(txt_LKWNr_M.Text) Then
+                regexval_txt_LKWNr_M.Enabled = False
+            Else
+                regexval_txt_LKWNr_M.Enabled = True
+            End If
+            If String.IsNullOrEmpty(txt_KdNrAuftrag_M.Text) = True Then
+                regval_txt_KdNrAuftrag_M.Enabled = False
+            Else
+                regval_txt_KdNrAuftrag_M.Enabled = True
+            End If
+            If String.IsNullOrEmpty(txt_Empfaenger_M.Text) = True Then
+                regval_txt_Empfaenger_M.Enabled = False
+            Else
+                regval_txt_Empfaenger_M.Enabled = True
+            End If
+            If String.IsNullOrEmpty(txt_Absender_M.Text) = True Then
+                regval_txt_Absender_M.Enabled = False
+            Else
+                regval_txt_Absender_Meset.Enabled = True
+            End If
         End If
     End Sub