Some final bug fixes for using new xml2json

Signed-off-by: Michel <info@1st-setup.nl>