Save empty fields as null