{%- endif %}
{% for pt_stop in public_transport_stops -%}
-* {{ h.list_template('Haltestelle', [pt_stop.get('name', ''), '', h.json_pos_ele_position(pt_stop.get('position', '')), h.json_pos_ele_elevation(pt_stop.get('position', ''))]) }}
+* {{ h.list_template('Haltestelle', [pt_stop.municipality, pt_stop.name_local, h.json_pos_ele_position(pt_stop.get('position', '')), h.json_pos_ele_elevation(pt_stop.get('position', ''))]) }}
{% for template_name in ['monitor_template', 'route_arrival_template', 'route_departure_template'] -%}
{% if template_name in pt_stop -%}
** {{ h.json_template(pt_stop[template_name]) }}