[OE-3658] child element bugfixes