Shouldn't we simply omit the `TAG` map element rather than setting it to `null` ?