Move site lookup earlier.