Update mapfiles so that we can properly handle numeric values when there's a limited set of values
Update the CSV loader to properly handle null values