Further conflict resolution, minor bug fix in mapRecord.js relating to auto-selection of entries on load.