includes comments replies to fix N + 1 query