Some cleanups
Ability to add nodes from search results