Merge pull request #598 from ovatsus/HtmlTypeProvider

HtmlProvider improvements