Make fewer queries for diag dashboard