- added support for types filtering