- We shouldn't resolve in the mapping row view. - Remove some of the Display implementations, at the moment it's a bit redundant (`TargetModel` and `TargetModelWithContext`).