Problem with Null values in Maps and other columns fixed