MOBILE-427 Refactor saveSite