all filtering works in refactored form