Small additions to mapping
Merge branch 'development' of https://github.com/CarersBeta/ClaimCapture into development