Parser fixes new

Merged Alvin Noe Ladines requested to merge parser-fixes-new into reprocess

Implemented various fixes from issue #484 (closed)

Merge request reports