fix fliter
merge