Queries in dashboard model extended