Improvements on pre-filtering