Patch Set 5: Looks good to me, approved; IP review completed

This an improvement :)

The dialog still needs some more work. In the future, we should probably consider using a FilteredTree to make it easier to filter for items in the tree.