Improved filtering.