indexes and changes for case insensitive api use