Change the functionality of the filter option, and add the map option