Fix hierarchy widget for HTML type node representation, more fixes for mixed S3ResourceQuery/Query