Tweaks to topic tree