Further index optimisation.