Making some fixes to trie routing based on feedback.