Working first-level filter
Better display of filters
re-enable mapping