Fixed bug that created repeated layers, added map_name property to map data