Fix some sandboxing issue around original ids and sandbox values in a standard site