MANTA-42 proposed index fix