Add --efilter-samples and fix bug