Fixed Tree View state saving support