fixes in service classes + new items to treeview