More improvements to multisite loading