all fix and filter fix