--- a/report-templates/data-quality-report.yaml	Mon Jun 19 12:46:57 2023 +0200
+++ b/report-templates/data-quality-report.yaml	Mon Jun 19 17:21:45 2023 +0200
@@ -17,9 +17,9 @@
           # BN names
           - type: select
             statement: >
-              SELECT DISTINCT bottleneck_id, objnam AS bnnam, hm
+              SELECT DISTINCT bottleneck_id, concat(bottleneck_id, ' (', objnam, ')') AS bnnam, hm
                 FROM waterway.dqr_bottleneck_stats
-                WHERE cc = {{ cc }} ORDER BY hm, bottleneck_id, objnam;
+                WHERE cc = {{ cc }} ORDER BY hm, bottleneck_id;
             actions:
               - type: assign
                 name: last_row
@@ -49,7 +49,7 @@
               # BN SR-Count
               - type: select
                 statement: >
-                  SELECT concat(bottleneck_id, ' ', objnam), srcnt, fwacnt
+                  SELECT concat(bottleneck_id, ' (', objnam, ')') AS objnam, srcnt, fwacnt
                     FROM waterway.dqr_bottleneck_stats
                     WHERE cc = {{ cc }} AND month = {{ d }}
                     ORDER BY hm, bottleneck_id;