I found that 'request_with_query_count' was
not used anymore. While removing it, I did
some more refactoring of the N+1 context