Feature/add mode filter on map

Here's another.