MOBILE-427 Refactor loadSite