Fixed making handling incorrectly mapped OSM-data more consistent.