fixed a bunch of problems on update/rollback for subsites