Properly add that filter this time