UserError changes:  MapRecord mapRecord -> Long mapRecordId
Next iteration of edited list
Some comment cleanup.