Implement filter for articles and course packs
Fix conflicts
merge