Continue refactoring filter code.
Work on rst filter.