Migration to input tag.
More HI fixes from 5fc337f8feffee62749b5d2e9261b6b79f1ac8b9
Merge pull request #1751 from ktf/fix-HI

More HI fixes.