Add resource filter
Add comments filter and refactor