Fixed an infinite loop in newHierarchyName (wrong comparision of hierarchy name, esp. if empty string hierarchy).
Fixed an infinite loop in newHierarchyName (wrong comparision of hierarchy name, esp. if empty string hierarchy).

rpbouman/phase,rpbouman/phase,rpbouman/phase