Tweaks to topic tree imports