Changed default map data
Integrated filter