#923: #794 and others: markup and id updates
opened by njr2128