Feature/add mode filter on map

Same here.