Much improved folder highlighting, taking into account selections deep in a subtree.