fix nulls in non-collection fields