- Patch #8405 by Adrian:
   + Fixed duplicated view.
   + Fixed node types not being picked up correctly.
   + Improved error handling in case a particular node has not been found.