- To instance level dashboard and
- To group level dashboard
- Update queries to reflect this filter
- Add tests
- Rename constants to helpers