Adjusting how indexing is handled