fixes for organism 2 hierarchies