Changed field definitions for HTML entities