Resolve message parsing issues in CNW JS