HTML: Convert values appropriately (fix for arrays)

Further fixes for arrays of values
Merge remote-tracking branch 'origin/template_fixes'