Fixed issue with filters not applying