Update default dashboard and alias queries.
Merge branch 'master' into demo