Improved navigation for RichTreeModelAdaptor