Reorganized Maps with Filters

Draw methods now don’t take a GenreFilter object.  Instead, it will be
necessary to up the map’s filter object whenever the filter is changed.