filter pages update
merge conflict fix