diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx
index d0651cf..efd29a9 100644
--- a/Customers/CustomsAviso.aspx
+++ b/Customers/CustomsAviso.aspx
@@ -123,7 +123,7 @@
                                           <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseOne" aria-expanded="false" aria-controls="collapseOne">Erweiterte Suche</button>
                                           </h2>
                                         </div>
-                               
+                               <asp:HiddenField ID="hfAccordionIndex" runat="server" />
                                         <div id="collapseOne" class="accordion-collapse collapse hide" aria-labelledby="headingOne" data-bs-parent="#accordionExample">   
                                                     <div class="card card-body">
                                                      <div class="col-12" id="cont3">                                  
@@ -216,15 +216,15 @@
 <script src="https://cdn.jsdelivr.net/jquery.validation/1.16.0/jquery.validate.min.js"></script>
 <script src="https://cdn.jsdelivr.net/jquery.validation/1.16.0/additional-methods.min.js"></script>
 <script>       
-    function GetSelectedVal(ele) {
-        $("#container2").hide();
+    
+   function GetSelectedVal(ele) {
+        
         var el = $(ele).closest('label').text();
         var date1 = document.getElementById('<%=pickdate1.ClientID%>');
-        var date2 = document.getElementById('<%=pickdate2.ClientID%>');
+       var date2 = document.getElementById('<%=pickdate2.ClientID%>');
+       $("#container2").hide();
         if (el == "Alle") {
-            $("#container2").show();            
-            date1.required = true;
-            date2.required = true;           
+           
         } else if (el == "Alle_M") {
             $("#container2").show();
             date1.required = true;
@@ -232,20 +232,21 @@
         } else if (el == "Freigabe") {
             $("#container2").show();
             date1.required = true;
-           date2.required = true;
-           dat
+            date2.required = true;
+            dat
         } else if (el == "Freigabe_M") {
-           $("#container2").show();
-           date1.required = true;
-           date2.required = true;
+            $("#container2").show();
+            date1.required = true;
+            date2.required = true;
         } else {
             $("#container2").hide();
             date1.required = false;
             date2.required = false;
             date1.text = "";
             date2.text = "";
-        }           
-    }           
+        }
+    }
+        
 </script>
 
     <script type="text/javascript">
@@ -269,20 +270,24 @@
             }
         };
     </script>   
-    <script type="text/javascript">
-        $(document).ready(function () {
-            // Get saved data from sessionStorage
-            let selectedCollapse = sessionStorage.getItem('selectedCollapse');
-            if (selectedCollapse != null) {
-                $('accordion-button collapsed').removeClass('show');
-                $(selectedCollapse).addClass('show');
-            }
-            //To set, which one will be opened
-            $('accordion-button collapsed').on('click', function () {
-                let target = $(this).data('target');
-                //Save data to sessionStorage
-                sessionStorage.setItem('selectedCollapse', target);
-            });
-            }
-    </script>
+   <script >
+       $(document).ready(function () {
+           //when a group is shown, save it as the active accordion group
+           $("#accordionExample").on('shown.bs.collapse', function () {
+               var active = $("#accordion .in").attr('id');
+               $.cookie('activeAccordionGroup', active);
+               //  alert(active);
+           });
+           $("#accordionExample").on('hidden.bs.collapse', function () {
+               $.removeCookie('activeAccordionGroup');
+           });
+           var last = $.cookie('activeAccordionGroup');
+           if (last != null) {
+               //remove default collapse settings
+               $("#accordionExample .panel-collapse").removeClass('in');
+               //show the account_last visible group
+               $("#" + last).addClass("in");
+           }
+       });
+   </script>
 </asp:Content>
\ No newline at end of file
diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb
index 4ba3fcf..9a7377e 100644
--- a/Customers/CustomsAviso.aspx.vb
+++ b/Customers/CustomsAviso.aspx.vb
@@ -165,56 +165,56 @@ Partial Class Kundenbereich_Default
         If txt_Absender.Text IsNot "" Then
             txt_Absender.ValidateRequestMode = UI.ValidateRequestMode.Enabled
             Try
-                Absender = Server.HtmlEncode(txt_Absender.Text)
+                Absender = txt_Absender.Text
             Catch ex As FormatException
                 MsgBox("Diese Daten sind nicht gültig!", MsgBoxStyle.Critical)
             End Try
         ElseIf txt_Empfaenger.Text IsNot "" Then
             txt_Empfaenger.ValidateRequestMode = UI.ValidateRequestMode.Enabled
             Try
-                Empfaenger = Server.HtmlEncode(txt_Empfaenger.Text)
+                Empfaenger = txt_Empfaenger.Text
             Catch ex As FormatException
                 MsgBox("Diese Daten sind nicht gültig!", MsgBoxStyle.Critical)
             End Try
         ElseIf txt_KdNrAuftrag.Text IsNot "" Then
             txt_KdNrAuftrag.ValidateRequestMode = UI.ValidateRequestMode.Enabled
             Try
-                KDNAFNR = Server.HtmlEncode(txt_KdNrAuftrag.Text)
+                KDNAFNR = txt_KdNrAuftrag.Text
             Catch ex As FormatException
                 MsgBox("Diese Daten sind nicht gültig!", MsgBoxStyle.Critical)
             End Try
         ElseIf txt_LKWNr.Text IsNot "" Then
             txt_LKWNr.ValidateRequestMode = UI.ValidateRequestMode.Enabled
             Try
-                LKWNR = Server.HtmlEncode(txt_LKWNr.Text)
+                LKWNR = txt_LKWNr.Text
             Catch ex As FormatException
                 MsgBox("Diese Daten sind nicht gültig!", MsgBoxStyle.Critical)
             End Try
         ElseIf txt_Absender_M.Text IsNot "" Then
             txt_Absender_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
             Try
-                Absender = Server.HtmlEncode(txt_Absender_M.Text)
+                Absender = txt_Absender_M.Text
             Catch ex As FormatException
                 MsgBox("Diese Daten sind nicht gültig!", MsgBoxStyle.Critical)
             End Try
         ElseIf txt_Empfaenger_M.Text IsNot "" Then
             txt_Empfaenger_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
             Try
-                Empfaenger = Server.HtmlEncode(txt_Empfaenger_M.Text)
+                Empfaenger = txt_Empfaenger_M.Text
             Catch ex As FormatException
                 MsgBox("Diese Daten sind nicht gültig!", MsgBoxStyle.Critical)
             End Try
         ElseIf txt_KdNrAuftrag_M.Text IsNot "" Then
             txt_KdNrAuftrag_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
             Try
-                KDNAFNR = Server.HtmlEncode(txt_KdNrAuftrag_M.Text)
+                KDNAFNR = txt_KdNrAuftrag_M.Text
             Catch ex As FormatException
                 MsgBox("Diese Daten sind nicht gültig!", MsgBoxStyle.Critical)
             End Try
         ElseIf txt_LKWNr_M.Text IsNot "" Then
             txt_LKWNr_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
             Try
-                LKWNR = Server.HtmlEncode(txt_LKWNr_M.Text)
+                LKWNR = txt_LKWNr_M.Text
             Catch ex As FormatException
                 MsgBox("Diese Daten sind nicht gültig!", MsgBoxStyle.Critical)
             End Try
@@ -223,7 +223,7 @@ Partial Class Kundenbereich_Default
         If rbt_Alle.Checked = True Or rbt_Alle_M.Checked = True Then
             pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled
             pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled
-            dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Server.HtmlDecode(Art), Kdnrtext, {0, 1, 2, 3, 4, 5}, datevon, datebis, Server.HtmlDecode(Absender), Server.HtmlDecode(Empfaenger), Server.HtmlDecode(LKWNR), Server.HtmlDecode(KDNAFNR))
+            dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {0, 1, 2, 3, 4, 5}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
             If pickdate1.Text = Nothing Or pickdate2.Text = Nothing Then
                 Try
                     Dim erster = New Date(Now().Year, Now().Month, 1)
@@ -245,7 +245,7 @@ Partial Class Kundenbereich_Default
                 End Try
             End If
         ElseIf rbt_Erf.Checked = True Or rbt_Erf_M.Checked = True Then
-            dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Server.HtmlDecode(Art), Kdnrtext, {0}, Nothing, Nothing, Server.HtmlDecode(Absender), Server.HtmlDecode(Empfaenger), Server.HtmlDecode(LKWNR), Server.HtmlDecode(KDNAFNR))
+            dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {0}, Nothing, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR)
         ElseIf rbt_Freig.Checked = True Or rbt_Freig_M.Checked = True Then
             pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled
             pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled
@@ -257,23 +257,24 @@ Partial Class Kundenbereich_Default
                 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
+                dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {1}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
             Else
                 Try
                     datevon = Date.Parse(pickdate1.Text)
                     'MsgBox(pickdate1.Text)
                     datebis = Date.Parse(pickdate2.Text)
                     ' MsgBox(pickdate2.Text)
-                    dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Server.HtmlDecode(Art), Kdnrtext, {1}, datevon, datebis, Server.HtmlDecode(Absender), Server.HtmlDecode(Empfaenger), Server.HtmlDecode(LKWNR), Server.HtmlDecode(KDNAFNR))
+                    dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {1}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
                 Catch ex As ValidationException When Date.ParseExact(pickdate1.Text, "dd.MM.yyyy", Nothing).Year < Date.ParseExact("2001", "yyyy", Nothing).Year And Date.ParseExact(pickdate2.Text, "dd.MM.yyyy", Nothing).Year > Date.ParseExact(Today, "dd.MM.yyyy", Nothing).Year
                     MsgBox("Die Zeitzonen sind nicht gültig!", MsgBoxStyle.Exclamation)
                 End Try
             End If
         ElseIf rbt_Ankunft.Checked = True Or rbt_Ankunft_M.Checked = True Then
-            dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Server.HtmlDecode(Art), Kdnrtext, {3}, Nothing, Nothing, Server.HtmlDecode(Absender), Server.HtmlDecode(Empfaenger), Server.HtmlDecode(LKWNR), Server.HtmlDecode(KDNAFNR))
+            dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {3}, Nothing, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR)
         ElseIf rbt_Vorb.Checked = True Or rbt_Vorb_M.Checked = True Then
-            dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Server.HtmlDecode(Art), Kdnrtext, {4}, Nothing, Nothing, Server.HtmlDecode(Absender), Server.HtmlDecode(Empfaenger), Server.HtmlDecode(LKWNR), Server.HtmlDecode(KDNAFNR))
+            dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {4}, Nothing, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR)
         ElseIf rbt_Vorg.Checked = True Or rbt_Vorg_M.Checked = True Then
-            dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Server.HtmlDecode(Art), Kdnrtext, {5}, Nothing, Nothing, Server.HtmlDecode(Absender), Server.HtmlDecode(Empfaenger), Server.HtmlDecode(LKWNR), Server.HtmlDecode(KDNAFNR))
+            dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {5}, Nothing, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR)
         End If
 
         If dt IsNot Nothing AndAlso Not dt.Rows.Count = 0 Then
@@ -417,12 +418,7 @@ Partial Class Kundenbereich_Default
         pickdate2.Text = Date.Parse(erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
         datevon = Nothing
         datebis = Nothing
-        If pickdate1.Attributes.Item("required") = True Then
-            pickdate1.Attributes.Item("required") = False
-        End If
-        If pickdate2.Attributes.Item("required") = True Then
-            pickdate2.Attributes.Item("required") = False
-        End If
+
         dt = Nothing
         'txt_KdNr.Focus()
     End Sub