Mapping issues being sorted