Optimize dashboard.soon with joins