Fix another bug where site was not passed after refactoring