Treeview sortable rework

* Fix #438