Forgot to check in filtering fix