Enforce optimal index

Hi Federico,

I think it makes sense. Thanks for the clarification!

Kind regards,
Ghislain