Revert bugs

Revert some bugs in parsing NTCIR task files