Refactor XML parsing to handle non-standart encodings
Add recovery mode for servers with suck