diff --git a/config.yml b/config.yml
index c59966a..7ddaad3 100644
--- a/config.yml
+++ b/config.yml
@@ -15,7 +15,7 @@ jinja_environment:
   hackerspaces:
 
     - name: 'CCC Basel'
-      address: 'Birsfelderstrasse 6, 4132 Muttenz'
+      address: 'Birsfelderstrasse 6<br/>4132 Muttenz'
       lat: 47.53230
       lon: 7.63421
       open:
@@ -30,7 +30,7 @@ jinja_environment:
       spaceapi: '/spaceapi-proxy/https/spaceapi.kabelsalat.ch/'
   
     - name: 'CCC Zürich'
-      address: 'Neue Hard 12, 8005 Zürich'
+      address: 'Neue Hard 12<br/>8005 Zürich'
       lat: 47.3869804
       lon: 8.5201701
       open:
@@ -45,7 +45,7 @@ jinja_environment:
       spaceapi: '/spaceapi-proxy/https/www.ccczh.ch/api/v13/'
   
     - name: 'Chaostreff Bern'
-      address: 'Kyburgstrasse 13, 3013 Bern'
+      address: 'Kyburgstrasse 13<br/>3013 Bern'
       lat: 46.9563416
       lon: 7.4483308
       open:
@@ -56,11 +56,10 @@ jinja_environment:
       web: 'https://chaostreffbern.ch/'
       contact:
         ml: 'https://lists.chaostreff.ch/postorius/lists/bern.chaostreff.ch/'
-        email: 'info(ät)chaostreffbern(punkt)ch'
       spaceapi: '/spaceapi-proxy/https/www.chaosbern.ch/spaceapi.json'
   
     - name: 'Coredump'
-      address: 'Eichwiesstrasse 4, 8645 Jona'
+      address: 'Eichwiesstrasse 4<br/>8645 Jona'
       lat: 47.2250881
       lon: 8.8338872
       open:
@@ -73,7 +72,7 @@ jinja_environment:
       spaceapi: '/spaceapi-proxy/https/status.crdmp.ch/'
   
     - name: 'Eastermundingen'
-      address: 'Steinbruchweg 16, 3072 Ostermundigen'
+      address: 'Steinbruchweg 16<br/>3072 Ostermundigen'
       lat: 46.95151
       lon: 7.49408
       open:
@@ -81,12 +80,12 @@ jinja_environment:
         fr: 'Mercredi à partir de 18:00'
         it: 'Mercoledì da 18:00'
         en: 'Every Wednesday from 18:00'
-      web: 'https://www.eastermundigen.ch/'
+      web: 'https://eastermundigen.ch/'
       contact:
         ml: 'https://lists.chaostreff.ch/postorius/lists/bern.chaostreff.ch/'
 
     - name: 'ODENWILUSENZ'
-      address: 'Hardmorgenweg 21, 8222 Beringen'
+      address: 'Hardmorgenweg 21<br/>8222 Beringen'
       lat: 47.6951648
       lon: 8.5806972
       open:
@@ -98,7 +97,7 @@ jinja_environment:
       contact: {}
 
     - name: 'Ruum42'
-      address: 'Andreasstrasse 5, 9000 St. Gallen'
+      address: 'Andreasstrasse 5<br/>9000 St. Gallen'
       lat: 47.4207758
       lon: 9.3555784
       open:
diff --git a/src/chaostreff.js b/src/chaostreff.js
index fe76416..5b1e2ff 100644
--- a/src/chaostreff.js
+++ b/src/chaostreff.js
@@ -26,7 +26,7 @@ window.onload = (ev) => {
     let newtable = '';
     for (let i = 0; i < spaces.length; ++i) {
 	let marker = L.marker([spaces[i].lat, spaces[i].lon], {icon: blueIcon})
-		      .bindPopup(`<b>${spaces[i].name}</b><address>${spaces[i].address.replaceAll(',', '<br/>')}</address><a href="${spaces[i].web}">${spaces[i].web}</a>`)
+		      .bindPopup(`<b>${spaces[i].name}</b><address>${spaces[i].address}</address><a href="${spaces[i].web}">${spaces[i].web}</a>`)
 		      .addTo(map);
 	if (spaces[i].spaceapi !== null) {
 	    fetch(spaces[i].spaceapi, {