Include site id in both thumbnail uid and upload location