diff --git a/initATLASAufschubkonten/cWorker_Verwahrung.vb b/initATLASAufschubkonten/cWorker_Verwahrung.vb
index a245715..c56b322 100644
--- a/initATLASAufschubkonten/cWorker_Verwahrung.vb
+++ b/initATLASAufschubkonten/cWorker_Verwahrung.vb
@@ -576,7 +576,7 @@ Anzeige:
                     Vorpapiernummer = Vorpapiernummer.ToString.Substring(0, 18)
                 End If
                 Dim dtSendungsInfo As New DataTable
-                dtSendungsInfo = SQL.loadDgvBySql("SELECT [FilialenNr],[AbfertigungsNr],[UnterNr] FROM [dbo].[tblSendungen] where tblSnd_ATB_T1 = '" & Vorpapiernummer & "'", "AVISO")
+                dtSendungsInfo = SQL.loadDgvBySql("SELECT [FilialenNr],[AbfertigungsNr],[UnterNr] FROM [dbo].[tblSendungen] where tblSnd_ATB_T1 = '" & Vorpapiernummer & "' and tblSnd_Abfertigungsart_ID = 44", "AVISO")
 
                 If dtSendungsInfo.Rows.Count > 0 Then
                     filiale = dtSendungsInfo.Rows(0).Item("FilialenNr")
@@ -854,7 +854,15 @@ Anzeige:
                             If isNCTS Then
                                 sqlString = "Select * From [tblGesamtsicherheit] as gs left join tblGesamtsicherheitsPositionen as pos on pos.gsp_gsId = gs.gs_gsId where [gs_MRNNr] = '" & MRN_SUMA & "' and [gs_dakoyimport] = 1  order by gsp_gspPosId" 'dieser wird bei NCTS explizit angegeben!
                             Else
-                                sqlString = "Select * From [tblGesamtsicherheit] as gs left join tblGesamtsicherheitsPositionen as pos on pos.gsp_gsId = gs.gs_gsId  where ([gs_VeralteteWeitereRegistriernummer] = '" & MRN_SUMA & "' or [gs_MRNNr] = '" & MRN_Erledigung & "') and [gs_dakoyimport] = 1  order by gsp_gspPosId, gsp_MRNNr"
+
+                                Dim StringSub As String = ""
+                                If MRN_Erledigung <> "" Then
+                                    StringSub = "or [gs_VeralteteWeitereRegistriernummer] = '" & MRN_Erledigung & "'"
+                                Else
+
+                                End If
+                                sqlString = "Select * From [tblGesamtsicherheit] as gs left join tblGesamtsicherheitsPositionen as pos on pos.gsp_gsId = gs.gs_gsId  where ([gs_MRNNr] = '" & MRN_SUMA & "'" & StringSub & ") and [gs_dakoyimport] = 1  order by gsp_gspPosId, gsp_MRNNr"
+
                             End If
 
                             Dim dtGesamtsicherheit = SQL.loadDgvBySql(sqlString, "AVISO")
@@ -880,7 +888,7 @@ Anzeige:
 
                                 'Berechnung Warenwert und Sicherheitsbetrag aus Sendung -> immer aus den Produktivdaten!
                                 VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
-                                Dim dtVorpapiere As DataTable = SQL.loadDgvBySql("SELECT tblSnd_Warenwert,tblSnd_WarenwertWaehrung,replace(tblSnd_Vorpapier_Pos,'+',',') as tblSnd_Vorpapier_Pos,replace(tblSnd_Vorpapier2_Pos,'+',',') as tblSnd_Vorpapier2_Pos, replace(tblSnd_Vorpapier3_Pos,'+',',') as tblSnd_Vorpapier3_Pos from tblSendungen where tblSnd_Vorpapier = '" & gsrightRow("gs_ATBNr") & "' Or tblSnd_Vorpapier2 = '" & gsrightRow("gs_ATBNr") & "' OR tblSnd_Vorpapier3 = '" & gsrightRow("gs_ATBNr") & "'", "AVISO")
+                                Dim dtVorpapiere As DataTable = SQL.loadDgvBySql("SELECT tblSnd_Warenwert,tblSnd_WarenwertWaehrung,replace(tblSnd_Vorpapier_Pos,'+',',') as tblSnd_Vorpapier_Pos,replace(tblSnd_Vorpapier2_Pos,'+',',') as tblSnd_Vorpapier2_Pos, replace(tblSnd_Vorpapier3_Pos,'+',',') as tblSnd_Vorpapier3_Pos from tblSendungen where (tblSnd_Vorpapier = '" & gsrightRow("gs_ATBNr") & "' Or tblSnd_Vorpapier2 = '" & gsrightRow("gs_ATBNr") & "' OR tblSnd_Vorpapier3 = '" & gsrightRow("gs_ATBNr") & "') and tblSnd_Vorpapier_Pos <> '?'", "AVISO")
 
                                 VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = testlauf