remove n+1 query