Added new filter from map
Removed old code