Replace output parsing order to avoid escaped links to files issue #36