Improve XML parser
Fix bookmark button is always disabled