diff --git a/Elwig/App.xaml.cs b/Elwig/App.xaml.cs
index 2e3c567..8ea13b8 100644
--- a/Elwig/App.xaml.cs
+++ b/Elwig/App.xaml.cs
@@ -201,6 +201,7 @@ namespace Elwig {
             BranchName = entry.Item2;
             BranchPlz = entry.Item3;
             BranchLocation = entry.Item4?
+                .Split(",")[0]
                 .Split(" in ")[0]
                 .Split(" im ")[0]
                 .Split(" an ")[0]
diff --git a/Elwig/Helpers/AppDbUpdater.cs b/Elwig/Helpers/AppDbUpdater.cs
index 2423004..5dc5a6a 100644
--- a/Elwig/Helpers/AppDbUpdater.cs
+++ b/Elwig/Helpers/AppDbUpdater.cs
@@ -9,7 +9,7 @@ namespace Elwig.Helpers {
     public static class AppDbUpdater {
 
         // Don't forget to update value in Tests/fetch-resources.bat!
-        public static readonly int RequiredSchemaVersion = 38;
+        public static readonly int RequiredSchemaVersion = 39;
 
         private static int VersionOffset = 0;
 
diff --git a/Elwig/Resources/Sql/38-39.sql b/Elwig/Resources/Sql/38-39.sql
new file mode 100644
index 0000000..4de5898
--- /dev/null
+++ b/Elwig/Resources/Sql/38-39.sql
@@ -0,0 +1,8 @@
+-- schema version 38 to 39
+
+PRAGMA writable_schema = ON;
+UPDATE sqlite_schema SET sql = REPLACE(sql, '{2,}', '{2,64}')
+WHERE type = 'table' AND name = 'member_email_address';
+PRAGMA writable_schema = OFF;
+
+UPDATE wb_gem SET hkid = 'WLLB' WHERE gkz IN (10710, 10723);
diff --git a/Tests/fetch-resources.bat b/Tests/fetch-resources.bat
index 2b510f9..bc57795 100644
--- a/Tests/fetch-resources.bat
+++ b/Tests/fetch-resources.bat
@@ -1 +1 @@
-curl --fail -s -L "https://elwig.at/files/create.sql?v=38" -u "elwig:ganzGeheim123!" -o "Resources\Sql\Create.sql"
+curl --fail -s -L "https://elwig.at/files/create.sql?v=39" -u "elwig:ganzGeheim123!" -o "Resources\Sql\Create.sql"