Fix: indentation, html field names with spaces (for AreaName)