fix N+1 query for single question load