Fix to correct XML parsing if GROUP has spaces in the name