Add site_id to context earlier to prevent no_source from filling (causing error and test failure)