Correct map and filter