diff --git a/Elwig/Helpers/AppDbUpdater.cs b/Elwig/Helpers/AppDbUpdater.cs
index 9685181..6522024 100644
--- a/Elwig/Helpers/AppDbUpdater.cs
+++ b/Elwig/Helpers/AppDbUpdater.cs
@@ -173,6 +173,17 @@ namespace Elwig.Helpers {
                 GROUP BY p.year, p.did, p.dpnr
                 ORDER BY p.year, p.did, p.dpnr;
                 """);
+
+            ExecuteNonQuery(cnx, "DROP VIEW v_bucket");
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_delivery_bin AS
+                SELECT year, mgnr,
+                       sortid || IIF(min_quw, REPLACE(COALESCE(attributes, ''), ',', ''), '_') AS bin,
+                       SUM(weight) AS weight
+                FROM v_delivery
+                GROUP BY year, mgnr, bin
+                ORDER BY year, mgnr, LENGTH(bin) DESC, bin;
+                """);
         }
     }
 }
diff --git a/Elwig/Helpers/Billing/Billing.cs b/Elwig/Helpers/Billing/Billing.cs
index d367454..5b85402 100644
--- a/Elwig/Helpers/Billing/Billing.cs
+++ b/Elwig/Helpers/Billing/Billing.cs
@@ -163,7 +163,7 @@ namespace Elwig.Helpers.Billing {
             using var cmd = cnx.CreateCommand();
             cmd.CommandText = $"""
                 SELECT bin, weight
-                FROM v_bin
+                FROM v_delivery_bin
                 WHERE (year, mgnr) = ({year}, {mgnr})
                 """;