Updated dashboard queries