Fixes #202

Improvements to Subject tree handling.