Fixed filters to make them actually work correctly