Fix content API put fields

We need all fields in the inner and outer JSON to have the new fieldnames.

Pretty much #3118, but with nesting. Somehow the old commits got lost.

EDIT:
We now no longer convert a collection ID to have dashes.