switch xml parser to one that actually works
fix "none" labels