- fixed parser to work correctly with html labels and the new format
- fixed and added testcases