Remove unnecessary filter call
Updates #28354
Add some @todos
Updates #28354