fix includes n+1 queries