TD-3298 Handle h2 and h3 tags