Update dashboard-account to use the new query function