Bug fixes and improvements for siteEntity loading