metadata: add support for fields that are not empty but have omitempty