MOM-79 Get N+1 results from DB instead of peeking