Various enhancements/fixes around hierarchical search/listing