Simplified the filter condition