Follow-up from "Resolve all todos when user submits an MR review"

The following discussion from !169938 (merged) should be addressed:

• @lauraXD started a discussion: (+3 comments)

  This is already over 100 - it concerns me that this already high query count is being increased. Can we avoid increasing this and find a way to optimize the queries?