adding support for complex filters (per support ticket #2464)