Make it work with new filter changes