Get rid of N+1 query