More index improvements