KON-618 HowToRun
diff --git a/deploy/db/02_create_tables_with_example_data.sql b/deploy/db/02_create_tables_with_example_data.sql
index e2f7bb7..979a88e 100644
--- a/deploy/db/02_create_tables_with_example_data.sql
+++ b/deploy/db/02_create_tables_with_example_data.sql
@@ -671,9 +671,11 @@
 	c.note,
 	s.type as salutation_type,
 	t.type as person_type,
-	a.street,
-	a.housenumber,
-	a.community,
+	COALESCE(a.community, '') ||
+	        CASE WHEN COALESCE(a.street, '') || COALESCE(a.housenumber, '') = '' THEN '' ELSE ', ' END ||
+	        COALESCE(a.street, '') ||
+	        CASE WHEN COALESCE(a.housenumber, '') = '' THEN '' ELSE ' ' END ||
+	        COALESCE(a.housenumber, '') as main_address,
 	com.communication_data as email,
 
 	UPPER(