diff --git a/grandlyon/scripts/generate-geojson.py b/grandlyon/scripts/generate-geojson.py
index 277080d..d14bfd1 100644
--- a/grandlyon/scripts/generate-geojson.py
+++ b/grandlyon/scripts/generate-geojson.py
@@ -28,7 +28,8 @@ for formdef in FormDef.select():
         formdata_id = feature['properties']['url'].split('/')[-2]
         formdata = formdef.data_class().get(formdata_id)
         formdata_vars = formdata.get_substitution_variables()
-        feature['properties']['message'] = formdata_vars['form_var_message']
+        for field in ('numero', 'voie', 'commune', 'message', 'type_probleme'):
+            feature['properties'][field] = formdata_vars.get('form_var_%s' % field)
         feature['properties']['datetime'] = formdata_vars['form_receipt_datetime'].strftime('%d/%m/%Y %H:%M')
 
     json.dump(geojson, open(os.path.join(geojson_dir, formdef.url_name + '.json'), 'w'),