Apply filters
930 and #929 fix browse issue
Merge pull request #984 from andrerod/dev

Apply filters