Filter rather than map + filter