fixes #8719 - remove n+1 queries on container index