insert elements unified and cleaned up
applying @xml:id to real sample