only map option values if they are defined