Improvements to the filtering scheme