Added support for new features in FilterObjects. Untested