Doc fixes and optimization in cases of only 1 entity needing preloading