Fix data/control tree mug path differences

Swap out tree traversal for hash lookup.