Follow-up fix for HTML-514, populate htmlform schema