Filter rework and levels fix