WithFilter done.
filter now works correctly.