Add tagging to html and md
 - fix regex on md to be non-greedy