added support for html values