Fixes issue 1: do not add fields when value is NULL