LPS-47370 suport for nested tabs --> now reordered without duplicated logic