Bugfix: use hierarchy only for output data