WPS: Fixing XML elements not passing the schema validation.