Misc tweaks and fixes

- Fixed package exports (left-over from container -> subset renaming)
- Changed the generation of mapped-field-key from mapped-field-id