Updated Dashboard query