improve filtering robustness