Fixing the todo filtering