Fixes more bugs with new Filters