Agreed changes

1-  OrphanResource call method 
2- and some refactoring
Maybe a shorted name like "navigator_or_orphan"?