wip: Potential fixes that are needed for correct demodata.xml application