index mapping has been improved.