refactor feed filtering
Merge pull request #2439 from ngokevin/filterrefactor

refactor feed filtering