remove n+1 request