CLSN-545 Remove extra Span if not necessary from Hierarchy screen