Partial improvements
Improved test coverage for advanced filter options