fix more hierarchical selection bugs. fixes #775