Updated htmldiff and component template parsing