fix UpdateSet and make it less braindead
fix application of hierarchy updates