diff --git a/ENI2/App.config b/ENI2/App.config
index 4c7c4bc1..6105b6f2 100644
--- a/ENI2/App.config
+++ b/ENI2/App.config
@@ -29,7 +29,7 @@
 				<value>http://192.168.2.24/LockingService/LockingService.svc</value>				
             </setting>
             <setting name="ConnectionString" serializeAs="String">
-				<value>Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value>				
+				<value>Initial Catalog=nswtest;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value>				
             </setting>
         </ENI2.Properties.Settings>
     </applicationSettings>
diff --git a/ENI2/Resources/EUREPORT.png b/ENI2/Resources/EUREPORT.png
index a5a38e0c..375b2af7 100644
Binary files a/ENI2/Resources/EUREPORT.png and b/ENI2/Resources/EUREPORT.png differ
diff --git a/bsmd.database/Properties/AssemblyProductInfo.cs b/bsmd.database/Properties/AssemblyProductInfo.cs
index c0ffb117..72844833 100644
--- a/bsmd.database/Properties/AssemblyProductInfo.cs
+++ b/bsmd.database/Properties/AssemblyProductInfo.cs
@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("schick Informatik")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("7.12.0")]
+[assembly: AssemblyInformationalVersion("7.13.0")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2023 schick Informatik")]
 [assembly: AssemblyTrademark("")]
\ No newline at end of file
diff --git a/bsmd.database/Properties/AssemblyProjectInfo.cs b/bsmd.database/Properties/AssemblyProjectInfo.cs
index ddc6e746..95f10891 100644
--- a/bsmd.database/Properties/AssemblyProjectInfo.cs
+++ b/bsmd.database/Properties/AssemblyProjectInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("7.12.0.*")]
+[assembly: AssemblyVersion("7.13.0.*")]
 
diff --git a/bsmd.database/TreatmentFacilityProvider.cs b/bsmd.database/TreatmentFacilityProvider.cs
index 3a72b4a3..d3e45e72 100644
--- a/bsmd.database/TreatmentFacilityProvider.cs
+++ b/bsmd.database/TreatmentFacilityProvider.cs
@@ -12,11 +12,15 @@ namespace bsmd.database
     public class TreatmentFacilityProvider : DatabaseEntity, ISublistElement
     {
 
+        #region Construction
+
         public TreatmentFacilityProvider()
         {
             this.tablename = "[dbo].[TreatmentFacilityProvider]";
         }
 
+        #endregion
+
         #region Properties
 
         [JsonIgnore]
@@ -107,6 +111,8 @@ namespace bsmd.database
             if (this.Identifier == null) return 1;
             if ((obj is null) || (((TreatmentFacilityProvider)obj).Identifier == null))
                 return 1;
+            if (Int32.TryParse(((TreatmentFacilityProvider)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
+                return i2.CompareTo(i1);
             return this.Identifier.CompareTo(((TreatmentFacilityProvider)obj).Identifier);
         }
 
diff --git a/bsmd.database/WAS.cs b/bsmd.database/WAS.cs
index b427b419..3dcf06a3 100644
--- a/bsmd.database/WAS.cs
+++ b/bsmd.database/WAS.cs
@@ -582,5 +582,5 @@ namespace bsmd.database
 
         #endregion
 
-    }    
+    }
 }
diff --git a/bsmd.database/WAS_RCPT.cs b/bsmd.database/WAS_RCPT.cs
index 878a8a19..178c0bfd 100644
--- a/bsmd.database/WAS_RCPT.cs
+++ b/bsmd.database/WAS_RCPT.cs
@@ -424,6 +424,8 @@ namespace bsmd.database
             if (this.Identifier == null) return 1;
             if ((obj is null) || (((WAS_RCPT)obj).Identifier == null))
                 return 1;
+            if (Int32.TryParse(((WAS_RCPT)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
+                return i2.CompareTo(i1);
             return this.Identifier.CompareTo(((WAS_RCPT)obj).Identifier);
         }
 
diff --git a/bsmd.database/Waste.cs b/bsmd.database/Waste.cs
index eb9fcc5d..eadad093 100644
--- a/bsmd.database/Waste.cs
+++ b/bsmd.database/Waste.cs
@@ -282,6 +282,8 @@ namespace bsmd.database
             if (this.Identifier == null) return 1;
             if ((obj is null) || (((Waste)obj).Identifier == null))
                 return 1;
+            if (Int32.TryParse(((Waste)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
+                return i2.CompareTo(i1);
             return this.Identifier.CompareTo(((Waste)obj).Identifier);
         }
 
diff --git a/bsmd.database/WasteReceived.cs b/bsmd.database/WasteReceived.cs
index 66245887..76e4244b 100644
--- a/bsmd.database/WasteReceived.cs
+++ b/bsmd.database/WasteReceived.cs
@@ -149,6 +149,8 @@ namespace bsmd.database
             if (this.Identifier == null) return 1;
             if ((obj is null) || (((WasteReceived)obj).Identifier == null))
                 return 1;
+            if (Int32.TryParse(((WasteReceived)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
+                return i2.CompareTo(i1);
             return this.Identifier.CompareTo(((WasteReceived)obj).Identifier);
         }