Support queries for group and class on the dashboard.
before rebasing