Fixes to Analytics
Improve slow page load query