Implement category filtering
Merge pull request #1368 from mahagr/master

Implement category filtering