Use filter_map instead of map().filter_map()

Use filter_map instead of map().filter_map() #38