Fixing more N + 1 queries