LPS-49964 update mapping to improve highlight performance