Fixed dashboard queries