minor changes. Added get_site_id calls to data loading functions