Minor upgrade on sample filtering.