Fully fixes n+1 issue in the dashboard