Fix CDATA populate for Layers and Features