More changes to handle null values in html