expand search and treeview correctly - issue #5