Refactor #9930 update tv type numeric and email to html5