More tweaks for taxonomy traversal