Refactor filtering
Merge branch 'master' of github.com:kesapojat/codebrowser-web-client