Fixing parser/markupGenerator for upload