One change only: add a `metadata` filter in the JSON output, to include all user-defined fields in the returned map
