ensure blank/null fields are preserved