WIP data.js on server aggregates
Add query class to analytics.js
Fix state
Fix data
Fix display
Fix charts.chart