Handle more CommonsMetadata fields

please use === null