Change added support for html fields