Add support for SavedFilter