fix prefilter issue
merge master