Fixed Tree View handling