Implemented new FilteredTreeModel
Minor changes, safety point
Changed filtering of tree