better markup/reparse for fancy org