Filtering feature added