fix filters
merge conflict