revert reverse mappings, prevent invalid mappings, directly map to owning viewmodel